From 2d9dea5d0c472ae4ce55959faecc79f09dc98bc0 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 29 Oct 2026 09:27:00 +0000
Subject: [PATCH 1/3] defer image cache stats in the cache manager utility

---
 resources/js/pages/utilities/Cache.vue        | 16 ++++++--
 .../CP/Utilities/CacheController.php          |  2 +-
 tests/Feature/Utilities/CacheManagerTest.php  | 41 +++++++++++++++++++
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 tests/Feature/Utilities/CacheManagerTest.php

diff --git a/resources/js/pages/utilities/Cache.vue b/resources/js/pages/utilities/Cache.vue
index a3f78faba35..b6c34b95792 100644
--- a/resources/js/pages/utilities/Cache.vue
+++ b/resources/js/pages/utilities/Cache.vue
@@ -1,9 +1,9 @@
 <script setup>
-import { router } from '@inertiajs/vue3';
+import { Deferred, router } from '@inertiajs/vue3';
 import Head from '@/pages/layout/Head.vue';
 import {
 	Header, Button, Panel, PanelHeader, Heading, Card, Description, Badge, DocsCallout, CommandPaletteItem,
-	Dropdown, DropdownMenu, DropdownItem, Textarea, ErrorMessage, Modal, ModalClose
+	Dropdown, DropdownMenu, DropdownItem, Textarea, ErrorMessage, Modal, ModalClose, Icon
 } from '@ui';
 import { ref } from 'vue';
 
@@ -217,8 +217,16 @@ function invalidateStaticUrls() {
                 <Card class="flex-1">
                     <Description>{{ __('statamic::messages.cache_utility_image_cache_description') }}</Description>
                     <div class="flex flex-wrap gap-2 mt-3">
-                        <Badge :prepend="__('Cached images')">{{ images.count }}</Badge>
-                        <Badge :prepend="__('Size')">{{ images.size }}</Badge>
+                        <Deferred data="images">
+                            <template #fallback>
+                                <div class="flex h-6 items-center gap-2 text-sm text-gray-500">
+                                    <Icon name="loading" class="size-4" />
+                                    {{ __('Loading') }}
+                                </div>
+                            </template>
+                            <Badge :prepend="__('Cached images')">{{ images.count }}</Badge>
+                            <Badge :prepend="__('Size')">{{ images.size }}</Badge>
+                        </Deferred>
                     </div>
                 </Card>
             </Panel>
diff --git a/src/Http/Controllers/CP/Utilities/CacheController.php b/src/Http/Controllers/CP/Utilities/CacheController.php
index e9a42d0df09..91fe82e1eec 100644
--- a/src/Http/Controllers/CP/Utilities/CacheController.php
+++ b/src/Http/Controllers/CP/Utilities/CacheController.php
@@ -25,7 +25,7 @@ public function index()
             'stache' => $this->getStacheStats(),
             'cache' => $this->getApplicationCacheStats(),
             'static' => $this->getStaticCacheStats(),
-            'images' => $this->getImageCacheStats(),
+            'images' => Inertia::defer(fn () => $this->getImageCacheStats()),
             'clearAllUrl' => cp_route('utilities.cache.clear-all'),
             'clearStacheUrl' => cp_route('utilities.cache.clear-stache'),
             'warmStacheUrl' => cp_route('utilities.cache.warm-stache'),
diff --git a/tests/Feature/Utilities/CacheManagerTest.php b/tests/Feature/Utilities/CacheManagerTest.php
new file mode 100644
index 00000000000..294387f9108
--- /dev/null
+++ b/tests/Feature/Utilities/CacheManagerTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Tests\Feature\Utilities;
+
+use Illuminate\Support\Facades\Storage;
+use Inertia\Testing\AssertableInertia;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CacheManagerTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    /**
+     * @see https://github.com/statamic/cms/issues/15623
+     */
+    #[Test]
+    public function it_defers_the_image_cache_stats()
+    {
+        config(['statamic.assets.image_manipulation.cache' => 'glide']);
+
+        Storage::fake('glide');
+        Storage::disk('glide')->put('containers/main/foo.jpg/abc.jpg', 'foo');
+        Storage::disk('glide')->put('containers/main/bar.jpg/def.jpg', 'barbaz');
+
+        $this
+            ->actingAs(tap(User::make()->makeSuper())->save())
+            ->get(cp_route('utilities.cache'))
+            ->assertOk()
+            ->assertInertia(fn (AssertableInertia $page) => $page
+                ->component('utilities/Cache')
+                ->missing('images')
+                ->loadDeferredProps(fn (AssertableInertia $reload) => $reload
+                    ->where('images.count', 2)
+                    ->where('images.size', '9 B')
+                )
+            );
+    }
+}

From 65eb4a804983f2e70cc30f518716520bab2fc730 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 29 Oct 2026 09:31:42 +0000
Subject: [PATCH 2/3] load deferred props without `loadDeferredProps()` for
 older inertia versions

---
 tests/Feature/Utilities/CacheManagerTest.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/Feature/Utilities/CacheManagerTest.php b/tests/Feature/Utilities/CacheManagerTest.php
index 294387f9108..676bb5a0772 100644
--- a/tests/Feature/Utilities/CacheManagerTest.php
+++ b/tests/Feature/Utilities/CacheManagerTest.php
@@ -25,17 +25,24 @@ public function it_defers_the_image_cache_stats()
         Storage::disk('glide')->put('containers/main/foo.jpg/abc.jpg', 'foo');
         Storage::disk('glide')->put('containers/main/bar.jpg/def.jpg', 'barbaz');
 
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
         $this
-            ->actingAs(tap(User::make()->makeSuper())->save())
             ->get(cp_route('utilities.cache'))
             ->assertOk()
             ->assertInertia(fn (AssertableInertia $page) => $page
                 ->component('utilities/Cache')
                 ->missing('images')
-                ->loadDeferredProps(fn (AssertableInertia $reload) => $reload
-                    ->where('images.count', 2)
-                    ->where('images.size', '9 B')
-                )
             );
+
+        $this
+            ->get(cp_route('utilities.cache'), [
+                'X-Inertia' => 'true',
+                'X-Inertia-Partial-Component' => 'utilities/Cache',
+                'X-Inertia-Partial-Data' => 'images',
+            ])
+            ->assertOk()
+            ->assertJsonPath('props.images.count', 2)
+            ->assertJsonPath('props.images.size', '9 B');
     }
 }

From 9c471291daee77c0ffaf2f5b3c40ecc63a67f3d8 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 29 Oct 2026 09:35:17 +0000
Subject: [PATCH 3/3] require `inertiajs/inertia-laravel` 2.0.7 for
 `loadDeferredProps()`

---
 composer.json                                |  2 +-
 tests/Feature/Utilities/CacheManagerTest.php | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index a1adda516d3..7653066314d 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "bacon/bacon-qr-code": "^3.0",
         "composer/semver": "^3.4",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
-        "inertiajs/inertia-laravel": "^2.0 || ^3.0",
+        "inertiajs/inertia-laravel": "^2.0.7 || ^3.0",
         "intervention/image": "^3.9.1 || ^4.0",
         "james-heinrich/getid3": "^1.9.21",
         "laravel/framework": "^12.40.0 || ^13.0",
diff --git a/tests/Feature/Utilities/CacheManagerTest.php b/tests/Feature/Utilities/CacheManagerTest.php
index 676bb5a0772..294387f9108 100644
--- a/tests/Feature/Utilities/CacheManagerTest.php
+++ b/tests/Feature/Utilities/CacheManagerTest.php
@@ -25,24 +25,17 @@ public function it_defers_the_image_cache_stats()
         Storage::disk('glide')->put('containers/main/foo.jpg/abc.jpg', 'foo');
         Storage::disk('glide')->put('containers/main/bar.jpg/def.jpg', 'barbaz');
 
-        $this->actingAs(tap(User::make()->makeSuper())->save());
-
         $this
+            ->actingAs(tap(User::make()->makeSuper())->save())
             ->get(cp_route('utilities.cache'))
             ->assertOk()
             ->assertInertia(fn (AssertableInertia $page) => $page
                 ->component('utilities/Cache')
                 ->missing('images')
+                ->loadDeferredProps(fn (AssertableInertia $reload) => $reload
+                    ->where('images.count', 2)
+                    ->where('images.size', '9 B')
+                )
             );
-
-        $this
-            ->get(cp_route('utilities.cache'), [
-                'X-Inertia' => 'true',
-                'X-Inertia-Partial-Component' => 'utilities/Cache',
-                'X-Inertia-Partial-Data' => 'images',
-            ])
-            ->assertOk()
-            ->assertJsonPath('props.images.count', 2)
-            ->assertJsonPath('props.images.size', '9 B');
     }
 }