diff --git a/includes/FeedsHTTPCache.inc b/includes/FeedsHTTPCache.inc
index a6490c8..ce00bc1 100644
--- a/includes/FeedsHTTPCache.inc
+++ b/includes/FeedsHTTPCache.inc
@@ -117,7 +117,7 @@ class FeedsHTTPCache extends DrupalDatabaseCache {
 
     if (isset($cache->data) && is_object($cache->data) && !($cache->data instanceof FeedsHTTPCacheItem)) {
       // Convert to a FeedsHTTPCacheItem object.
-      $cache->data = new FeedsHTTPCacheItem($cache->data);
+      $cache->data = new FeedsHTTPCacheItem($cache->cid, $cache->data);
     }
 
     return $cache;
diff --git a/includes/FeedsHTTPCacheItem.inc b/includes/FeedsHTTPCacheItem.inc
index 4b2ee9e..f4cdd5a 100644
--- a/includes/FeedsHTTPCacheItem.inc
+++ b/includes/FeedsHTTPCacheItem.inc
@@ -151,7 +151,7 @@ class FeedsHTTPCacheItem {
   public function saveResponseData($response) {
     if (isset($response->data)) {
       // Get cache object, this object knows where to save the file.
-      $filename = $cache_object->saveFile($this->cid, $response);
+      $filename = $this->getCacheObject()->saveFile($this->cid, $response);
       $this->setFilePath($filename);
     }
   }