diff --git a/bl1/aarch64/bl1_context_mgmt.c b/bl1/aarch64/bl1_context_mgmt.c
index c78f6a9f5e12c46ee8e4bb73e27aeaea98b6f461..9de5fbbb72d9bd5d7e9ed5fda2a65a0ca8335377 100644
--- a/bl1/aarch64/bl1_context_mgmt.c
+++ b/bl1/aarch64/bl1_context_mgmt.c
@@ -114,6 +114,8 @@ void bl1_prepare_for_bl2_in_root(void)
 	bl2_ep_info->spsr = (uint32_t)SPSR_64(MODE_EL3, MODE_SP_ELX,
 						DISABLE_ALL_EXCEPTIONS);
 
+	flush_dcache_range((uintptr_t)bl2_ep_info, sizeof(entry_point_info_t));
+
 	/* Indicate that image is in execution state. */
 	bl2_desc->state = IMAGE_STATE_EXECUTED;
 
diff --git a/docs/components/rme/rme-userguide.rst b/docs/components/rme/rme-userguide.rst
index 4978f6ee96af32764294db6725183c6d77d73260..ba03bba9f792ebd2e9b7523909c8e3e52d83513e 100644
--- a/docs/components/rme/rme-userguide.rst
+++ b/docs/components/rme/rme-userguide.rst
@@ -83,7 +83,7 @@ To launch the Armv-A Base RevC AEM FVP, execute the following command:
     -C bp.refcounter.non_arch_start_at_default=1 \
     -C bp.refcounter.use_real_time=0 \
     -C bp.secure_memory=1 \
-    -C cache_state_modelled=0 \
+    -C cache_state_modelled=1 \
     -C cluster0.ecv_support_level=2 \
     -C cluster1.ecv_support_level=2 \
     -C cluster0.gicv3.cpuintf-mmap-access-level=2 \