diff --git a/src/Bootstrappers/CacheTagBootstrapper.php b/src/Bootstrappers/CacheTagBootstrapper.php
new file mode 100644
index 00000000..3721e9db
--- /dev/null
+++ b/src/Bootstrappers/CacheTagBootstrapper.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Bootstrappers;
+
+use Stancl\Tenancy\CacheManager;
+use Stancl\Tenancy\Contracts\Tenant;
+use Stancl\Tenancy\Contracts\TenancyBootstrapper;
+
+class CacheTagBootstrapper implements TenancyBootstrapper
+{
+    public function bootstrap(Tenant $tenant): void
+    {
+        CacheManager::$addTags = true;
+    }
+
+    public function revert(): void
+    {
+        CacheManager::$addTags = false;
+    }
+}
diff --git a/src/CacheManager.php b/src/CacheManager.php
index 757151d8..76db6369 100644
--- a/src/CacheManager.php
+++ b/src/CacheManager.php
@@ -10,7 +10,7 @@ use Illuminate\Cache\CacheManager as BaseCacheManager;
 
 class CacheManager extends BaseCacheManager
 {
-    public static bool $addTags = true;
+    public static bool $addTags = false;
 
     /**
      * Add tags and forward the call to the inner cache store.
diff --git a/tests/BootstrapperTest.php b/tests/BootstrapperTest.php
index d6118712..70501def 100644
--- a/tests/BootstrapperTest.php
+++ b/tests/BootstrapperTest.php
@@ -7,7 +7,6 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\URL;
 use Stancl\JobPipeline\JobPipeline;
 use Illuminate\Support\Facades\File;
-use Stancl\Tenancy\Bootstrappers\PrefixCacheTenancyBootstrapper;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Event;
@@ -29,6 +28,7 @@ use Stancl\Tenancy\Listeners\BootstrapTenancy;
 use Stancl\Tenancy\Tests\Etc\TestingBroadcaster;
 use Stancl\Tenancy\Listeners\DeleteTenantStorage;
 use Stancl\Tenancy\Listeners\RevertToCentralContext;
+use Stancl\Tenancy\Bootstrappers\CacheTagBootstrapper;
 use Stancl\Tenancy\Bootstrappers\UrlTenancyBootstrapper;
 use Stancl\Tenancy\Bootstrappers\MailTenancyBootstrapper;
 use Stancl\Tenancy\Bootstrappers\RedisTenancyBootstrapper;
@@ -36,7 +36,6 @@ use Stancl\Tenancy\Middleware\InitializeTenancyBySubdomain;
 use Stancl\Tenancy\Bootstrappers\DatabaseTenancyBootstrapper;
 use Stancl\Tenancy\Bootstrappers\BroadcastTenancyBootstrapper;
 use Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper;
-use Stancl\Tenancy\CacheManager;
 
 beforeEach(function () {
     $this->mockConsoleOutput = false;
@@ -84,11 +83,9 @@ test('database data is separated', function () {
 });
 
 test('cache data is separated', function () {
-    CacheManager::$addTags = true;
-
     config([
         'tenancy.bootstrappers' => [
-            PrefixCacheTenancyBootstrapper::class,
+            CacheTagBootstrapper::class,
         ],
         'cache.default' => 'redis',
     ]);
diff --git a/tests/CacheManagerTest.php b/tests/CacheManagerTest.php
index 7b1b99da..ff8a853b 100644
--- a/tests/CacheManagerTest.php
+++ b/tests/CacheManagerTest.php
@@ -2,16 +2,15 @@
 
 declare(strict_types=1);
 
-use Stancl\Tenancy\CacheManager;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 use Illuminate\Support\Facades\Event;
 use Stancl\Tenancy\Events\TenancyInitialized;
 use Stancl\Tenancy\Listeners\BootstrapTenancy;
+use Stancl\Tenancy\Bootstrappers\CacheTagBootstrapper;
 
 beforeEach(function () {
-    config(['tenancy.bootstrappers' => []]);
+    config(['tenancy.bootstrappers' => [CacheTagBootstrapper::class]]);
 
-    CacheManager::$addTags = true;
     Event::listen(TenancyInitialized::class, BootstrapTenancy::class);
 });
 
diff --git a/tests/GlobalCacheTest.php b/tests/GlobalCacheTest.php
index c4fcb0e5..f59ea401 100644
--- a/tests/GlobalCacheTest.php
+++ b/tests/GlobalCacheTest.php
@@ -2,16 +2,17 @@
 
 declare(strict_types=1);
 
+use Stancl\Tenancy\Tests\Etc\Tenant;
 use Illuminate\Support\Facades\Event;
 use Stancl\Tenancy\Events\TenancyEnded;
-use Stancl\Tenancy\Events\TenancyInitialized;
 use Stancl\Tenancy\Facades\GlobalCache;
+use Stancl\Tenancy\Events\TenancyInitialized;
 use Stancl\Tenancy\Listeners\BootstrapTenancy;
 use Stancl\Tenancy\Listeners\RevertToCentralContext;
-use Stancl\Tenancy\Tests\Etc\Tenant;
+use Stancl\Tenancy\Bootstrappers\CacheTagBootstrapper;
 
 beforeEach(function () {
-    config(['tenancy.bootstrappers' => []]);
+    config(['tenancy.bootstrappers' => [CacheTagBootstrapper::class]]);
 
     Event::listen(TenancyInitialized::class, BootstrapTenancy::class);
     Event::listen(TenancyEnded::class, RevertToCentralContext::class);