Override cache manager only in CacheTagsBootstrapper

src/Bootstrappers/CacheTagsBootstrapper.php

@@ -4,24 +4,50 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy\Bootstrappers;
 
-use Stancl\Tenancy\CacheManager;
-use Stancl\Tenancy\Contracts\TenancyBootstrapper;
+use Illuminate\Cache\CacheManager;
 use Stancl\Tenancy\Contracts\Tenant;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Contracts\Foundation\Application;
+use Stancl\Tenancy\Contracts\TenancyBootstrapper;
 
-/**
- * todo name.
- *
- * Separate tenant cache using tagging.
- */
 class CacheTagsBootstrapper implements TenancyBootstrapper
 {
+    protected ?CacheManager $originalCache = null;
+    public static string $cacheManagerWithTags = \Stancl\Tenancy\CacheManager::class;
+
+    public function __construct(
+        protected Application $app
+    ) {
+    }
+
     public function bootstrap(Tenant $tenant): void
     {
-        CacheManager::$addTags = true;
+        $this->resetFacadeCache();
+
+        $this->originalCache ??= $this->app['cache'];
+        $this->app->extend('cache', function () {
+            return new static::$cacheManagerWithTags($this->app);
+        });
     }
 
     public function revert(): void
     {
-        CacheManager::$addTags = false;
+        $this->resetFacadeCache();
+
+        $this->app->extend('cache', function () {
+            return $this->originalCache;
+        });
+
+        $this->originalCache = null;
+    }
+
+    /**
+     * This wouldn't be necessary, but is needed when a call to the
+     * facade has been made prior to bootstrapping tenancy. The
+     * facade has its own cache, separate from the container.
+     */
+    public function resetFacadeCache(): void
+    {
+        Cache::clearResolvedInstances();
     }
 }

src/CacheManager.php

@@ -10,8 +10,6 @@ use Illuminate\Cache\CacheManager as BaseCacheManager;
 
 class CacheManager extends BaseCacheManager
 {
-    public static bool $addTags = false;
-
     /**
      * Add tags and forward the call to the inner cache store.
      *
@@ -20,25 +18,21 @@ class CacheManager extends BaseCacheManager
      */
     public function __call($method, $parameters)
     {
-        if (tenancy()->initialized && static::$addTags) {
-            $tags = [config('tenancy.cache.tag_base') . tenant()?->getTenantKey()];
+        $tags = [config('tenancy.cache.tag_base') . tenant()?->getTenantKey()];
 
-            if ($method === 'tags') {
-                $count = count($parameters);
+        if ($method === 'tags') {
+            $count = count($parameters);
 
-                if ($count !== 1) {
-                    throw new \Exception("Method tags() takes exactly 1 argument. $count passed.");
-                }
-
-                $names = $parameters[0];
-                $names = (array) $names; // cache()->tags('foo') https://laravel.com/docs/9.x/cache#removing-tagged-cache-items
-
-                return $this->store()->tags(array_merge($tags, $names));
+            if ($count !== 1) {
+                throw new \Exception("Method tags() takes exactly 1 argument. $count passed.");
             }
 
-            return $this->store()->tags($tags)->$method(...$parameters);
+            $names = $parameters[0];
+            $names = (array) $names; // cache()->tags('foo') https://laravel.com/docs/9.x/cache#removing-tagged-cache-items
+
+            return $this->store()->tags(array_merge($tags, $names));
         }
 
-        return parent::__call($method, $parameters);
+        return $this->store()->tags($tags)->$method(...$parameters);
     }
 }

src/TenancyServiceProvider.php

@@ -133,10 +133,5 @@ class TenancyServiceProvider extends ServiceProvider
 
             return $instance;
         });
-
-        // todo https://discord.com/channels/976506366502006874/976513756576243733/1097778320692740096
-        $this->app->singleton('cache', function ($app) {
-            return new $this->app['config']['tenancy.cache.manager']($app);
-        });
     }
 }