Use cache cascade

Author: timkelty

composer.lock

@@ -9,6 +9,7 @@
     "craftcms/cms": "^4.6 || ^5.0",
     "bref/bref": "^2.4.2",
     "bref/extra-php-extensions": "^1.7.2",
+    "craftcms/yii2-cache-cascade": "^1.0",
     "yiisoft/yii2-redis": "^2.0",
     "yiisoft/yii2-queue": "^2.3.7",
     "aws/aws-sdk-php": "^3.342.6"

packages/cloud-ops/composer.json

@@ -4,7 +4,9 @@
 
 use Closure;
 use Craft;
+use craft\cachecascade\CascadeCache;
 use craft\helpers\App;
+use yii\caching\ArrayCache;
 use yii\redis\Cache as RedisCache;
 
 class AppConfig
@@ -71,27 +73,27 @@ private function getCacheConfig(): Closure
             $defaultDuration = Craft::$app->getConfig()->getGeneral()->cacheDuration;
             $valkey = $this->resolveValkeyEndpoint();
 
-            if ($valkey) {
-                return Craft::createObject([
-                    'class' => RedisCache::class,
-                    'defaultDuration' => $defaultDuration,
-                    'redis' => [
-                        'class' => Redis::class,
-                        'url' => $valkey,
-                        'database' => 0,
-                    ],
-                ]);
-            }
-
-            if ($this->tableExists(\craft\db\Table::CACHE)) {
-                return Craft::createObject([
-                    'class' => \craft\cache\DbCache::class,
-                    'cacheTable' => \craft\db\Table::CACHE,
-                    'defaultDuration' => $defaultDuration,
-                ]);
-            }
+            $primaryCache = $valkey ? [
+                'class' => RedisCache::class,
+                'defaultDuration' => $defaultDuration,
+                'redis' => [
+                    'class' => Redis::class,
+                    'url' => $valkey,
+                    'database' => 0,
+                ],
+            ] : [
+                'class' => \craft\cache\DbCache::class,
+                'cacheTable' => \craft\db\Table::CACHE,
+                'defaultDuration' => $defaultDuration,
+            ];
 
-            return Craft::createObject(App::cacheConfig());
+            return Craft::createObject([
+                'class' => CascadeCache::class,
+                'caches' => [
+                    $primaryCache,
+                    ['class' => ArrayCache::class],
+                ],
+            ]);
         };
     }