diff --git a/packages/ember-data/lib/system/store.js b/packages/ember-data/lib/system/store.js
index d25d52de937..85e3d2c7589 100644
--- a/packages/ember-data/lib/system/store.js
+++ b/packages/ember-data/lib/system/store.js
@@ -1899,6 +1899,12 @@ Store = Ember.Object.extend({
       return typeMaps[entry]['type'];
     }
 
+    for (var cacheKey in this._containerCache) {
+      this._containerCache[cacheKey].destroy();
+      delete this._containerCache[cacheKey];
+    }
+
+    delete this._containerCache;
   },
 
   /**