WIP

lib/interceptor/cache.js

@@ -124,24 +124,15 @@ module.exports = (opts = {}) => {
         // Check if the response is stale
         const now = Date.now()
         if (now >= value.staleAt) {
-          // TODO (fix): This whole bit is a bit suspect. In particular given that
-          // we dumped the body above.
-
-          if (now >= value.deleteAt) {
-            // Safety check in case the store gave us a response that should've been
-            // deleted already
-            return dispatch(opts, new CacheHandler(globalOpts, opts, handler))
-          }
-
-          if (!opts.headers) {
-            opts.headers = {}
-          }
-
-          opts.headers['if-modified-since'] = new Date(value.cachedAt).toUTCString()
-
           // Need to revalidate the response
           return dispatch(
-            opts,
+            {
+              ...opts,
+              headers: {
+                ...opts.headers,
+                'if-modified-since': new Date(value.cachedAt).toUTCString()
+              }
+            },
             new CacheRevalidationHandler(
               () => respondWithCachedValue(stream, value),
               new CacheHandler(globalOpts, opts, handler)