diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 6696d3b..0eb71d6 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1695,9 +1695,6 @@
     m_firstLayoutDone = false;
     cancelRedirection(true);
     m_client->provisionalLoadStarted();
-
-    if (canCachePage() && m_client->canCachePage() && !m_currentHistoryItem->isInPageCache())
-        cachePageForHistoryItem(m_currentHistoryItem.get());
 }
 
 bool FrameLoader::userGestureHint()
@@ -2517,6 +2514,11 @@
     RefPtr<CachedPage> cachedPage = prpCachedPage;
     RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
     
+    // Check to see if we need to cache the page we are navigating away from into the back/forward cache.
+    // We are doing this here because we know for sure that a new page is about to be loaded.
+    if (canCachePage() && m_client->canCachePage() && !m_currentHistoryItem->isInPageCache())
+        cachePageForHistoryItem(m_currentHistoryItem.get());
+
     if (m_loadType != FrameLoadTypeReplace)
         closeOldDataSources();