diff --git a/netwerk/protocol/http/src/nsHttpChannel.cpp b/netwerk/protocol/http/src/nsHttpChannel.cpp
index 08040a487c0..4b8f707e6f6 100644
--- a/netwerk/protocol/http/src/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/src/nsHttpChannel.cpp
@@ -849,8 +849,32 @@ nsHttpChannel::CallOnStartRequest()
 
     // install stream converter if required
     rv = ApplyContentConversions();
+    if (NS_FAILED(rv)) return rv;
 
-    return rv;
+    if (!mCanceled) {
+        // create offline cache entry if offline caching was requested
+        if (mCacheForOfflineUse) {
+            PRBool shouldCacheForOfflineUse;
+            rv = ShouldUpdateOfflineCacheEntry(&shouldCacheForOfflineUse);
+            if (NS_FAILED(rv)) return rv;
+            
+            if (shouldCacheForOfflineUse) {
+                LOG(("writing to the offline cache"));
+                rv = InitOfflineCacheEntry();
+                if (NS_FAILED(rv)) return rv;
+                
+                if (mOfflineCacheEntry) {
+                  rv = InstallOfflineCacheListener();
+                  if (NS_FAILED(rv)) return rv;
+                }
+            } else {
+                LOG(("offline cache is up to date, not updating"));
+                CloseOfflineCacheEntry();
+            }
+        }
+    }
+
+    return NS_OK;
 }
 
 nsresult
@@ -1134,28 +1158,8 @@ nsHttpChannel::ProcessNormal()
         rv = InstallCacheListener();
         if (NS_FAILED(rv)) return rv;
     }
-    // create offline cache entry if offline caching was requested
-    if (mCacheForOfflineUse) {
-        PRBool shouldCacheForOfflineUse;
-        rv = ShouldUpdateOfflineCacheEntry(&shouldCacheForOfflineUse);
-        if (NS_FAILED(rv)) return rv;
 
-        if (shouldCacheForOfflineUse) {
-            LOG(("writing to the offline cache"));
-            rv = InitOfflineCacheEntry();
-            if (NS_FAILED(rv)) return rv;
-
-            if (mOfflineCacheEntry) {
-                rv = InstallOfflineCacheListener();
-                if (NS_FAILED(rv)) return rv;
-            }
-        } else {
-            LOG(("offline cache is up to date, not updating"));
-            CloseOfflineCacheEntry();
-        }
-    }
-
-    return rv;
+    return NS_OK;
 }
 
 nsresult
@@ -2358,27 +2362,6 @@ nsHttpChannel::ReadFromCache()
         }
     }
 
-    // set up the offline cache entry for writing
-    if (mCacheForOfflineUse) {
-        PRBool shouldUpdateOffline;
-        rv = ShouldUpdateOfflineCacheEntry(&shouldUpdateOffline);
-        if (NS_FAILED(rv)) return rv;
-
-        if (shouldUpdateOffline) {
-            LOG(("writing to the offline cache"));
-            rv = InitOfflineCacheEntry();
-            if (NS_FAILED(rv)) return rv;
-
-            if (mOfflineCacheEntry) {
-                rv = InstallOfflineCacheListener();
-                if (NS_FAILED(rv)) return rv;
-            }
-        } else {
-            LOG(("offline cache is up to date, not updating"));
-            CloseOfflineCacheEntry();
-        }
-    }
-
     // open input stream for reading...
     nsCOMPtr<nsIInputStream> stream;
     rv = mCacheEntry->OpenInputStream(0, getter_AddRefs(stream));