diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index 8ef92e26..6055a1e5 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -39,6 +39,7 @@
 use Statamic\Eloquent\Taxonomies\TermQueryBuilder;
 use Statamic\Eloquent\Taxonomies\TermRepository;
 use Statamic\Eloquent\Tokens\TokenRepository;
+use Statamic\Facades\Stache;
 use Statamic\Providers\AddonServiceProvider;
 use Statamic\Statamic;
 
@@ -238,6 +239,8 @@ private function registerAssetContainers()
         });
 
         Statamic::repository(AssetContainerRepositoryContract::class, AssetContainerRepository::class);
+
+        Stache::exclude('asset-containers');
     }
 
     private function registerAssets()
@@ -265,6 +268,8 @@ private function registerAssets()
         });
 
         Statamic::repository(AssetRepositoryContract::class, AssetRepository::class);
+
+        Stache::exclude('assets');
     }
 
     private function registerBlueprints()
@@ -299,6 +304,8 @@ private function registerCollections()
         });
 
         Statamic::repository(CollectionRepositoryContract::class, CollectionRepository::class);
+
+        Stache::exclude('collections');
     }
 
     private function registerCollectionTrees()
@@ -322,6 +329,8 @@ private function registerCollectionTrees()
         });
 
         Statamic::repository(CollectionTreeRepositoryContract::class, CollectionTreeRepository::class);
+
+        Stache::exclude('collection-trees');
     }
 
     private function registerEntries()
@@ -345,6 +354,8 @@ private function registerEntries()
         });
 
         Statamic::repository(EntryRepositoryContract::class, EntryRepository::class);
+
+        Stache::exclude('entries');
     }
 
     private function registerFieldsets()
@@ -381,6 +392,8 @@ private function registerForms()
         });
 
         Statamic::repository(FormRepositoryContract::class, FormRepository::class);
+
+        Stache::exclude('forms');
     }
 
     private function registerFormSubmissions()
@@ -402,6 +415,8 @@ private function registerFormSubmissions()
                 $app['statamic.eloquent.form_submissions.model']::query()
             );
         });
+
+        Stache::exclude('form-submissions');
     }
 
     private function registerGlobals()
@@ -415,6 +430,8 @@ private function registerGlobals()
         });
 
         Statamic::repository(GlobalRepositoryContract::class, GlobalRepository::class);
+
+        Stache::exclude('globals');
     }
 
     private function registerGlobalVariables()
@@ -430,6 +447,8 @@ private function registerGlobalVariables()
         $this->app->bind('statamic.eloquent.global_set_variables.model', function () use ($usingOldConfigKeys) {
             return config($usingOldConfigKeys ? 'statamic.eloquent-driver.global_sets.variables_model' : 'statamic.eloquent-driver.global_set_variables.model');
         });
+
+        Stache::exclude('global-variables');
     }
 
     private function registerRevisions()
@@ -456,6 +475,8 @@ private function registerStructures()
         });
 
         Statamic::repository(NavigationRepositoryContract::class, NavigationRepository::class);
+
+        Stache::exclude('navigation');
     }
 
     private function registerStructureTrees()
@@ -479,6 +500,8 @@ private function registerStructureTrees()
         });
 
         Statamic::repository(NavTreeRepositoryContract::class, NavTreeRepository::class);
+
+        Stache::exclude('nav-trees');
     }
 
     public function registerTaxonomies()
@@ -492,6 +515,8 @@ public function registerTaxonomies()
         });
 
         Statamic::repository(TaxonomyRepositoryContract::class, TaxonomyRepository::class);
+
+        Stache::exclude('taxonomies');
     }
 
     public function registerTerms()
@@ -511,6 +536,8 @@ public function registerTerms()
         });
 
         Statamic::repository(TermRepositoryContract::class, TermRepository::class);
+
+        Stache::exclude('terms');
     }
 
     public function registerTokens()