Improve cacheable action request checks

Author: bencroker

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Blitz
 
+## 5.11.1 - 2025-05-19
+
+- Improved checks for cacheable action requests.
+
 ## 5.11.0 - 2025-05-19
 
 - Added a [Datastar](https://putyourlightson.com/plugins/datastar) integration that makes it possible to cache and serve streamed responses.

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "putyourlightson/craft-blitz",
   "description": "Intelligent static page caching for creating lightning-fast sites.",
-  "version": "5.11.0",
+  "version": "5.11.1",
   "type": "craft-plugin",
   "homepage": "https://putyourlightson.com/plugins/blitz",
   "license": "proprietary",

src/services/CacheRequestService.php

@@ -134,7 +134,7 @@ public function getIsCacheableRequest(): bool
         }
 
         if ($request->getIsActionRequest()
-            && !Blitz::$plugin->settings->cacheActionRequests
+            && !$this->getIsCacheableActionRequest()
         ) {
             return false;
         }
@@ -216,7 +216,10 @@ public function getIsCacheableSiteUri(?SiteUriModel $siteUri): bool
 
         $uri = mb_strtolower($siteUri->uri);
 
-        if (Blitz::$plugin->settings->onlyCacheLowercaseUris && $uri !== $siteUri->uri) {
+        if (Blitz::$plugin->settings->onlyCacheLowercaseUris
+            && $uri !== $siteUri->uri
+            && !$this->getIsCacheableActionRequest()
+        ) {
             Blitz::$plugin->debug('Page not cached because the URI contains uppercase characters.', [], $siteUri->uri);
 
             return false;
@@ -251,7 +254,7 @@ public function getIsCacheableSiteUri(?SiteUriModel $siteUri): bool
         // Ignore URIs that contain `index.php` but that are not action requests
         $generalConfig = Craft::$app->getConfig()->getGeneral();
         $pattern = '/index\.php(?!\?' . preg_quote($generalConfig->pathParam) . '=' . preg_quote($generalConfig->actionTrigger) . '\/)/';
-        if (preg_match($pattern, $uri, $m)) {
+        if (preg_match($pattern, $uri)) {
             Blitz::$plugin->debug('Page not cached because the URL contains `index.php`.', [], $url);
 
             return false;
@@ -270,7 +273,9 @@ public function getIsCacheableSiteUri(?SiteUriModel $siteUri): bool
             return false;
         }
 
-        if (Blitz::$plugin->settings->queryStringCaching === SettingsModel::QUERY_STRINGS_DO_NOT_CACHE_URLS) {
+        if (Blitz::$plugin->settings->queryStringCaching === SettingsModel::QUERY_STRINGS_DO_NOT_CACHE_URLS
+            && !$this->getIsCacheableActionRequest()
+        ) {
             $queryStringParams = QueryStringHelper::getValidQueryStringParams($siteUri->uri);
 
             if (!empty($queryStringParams)) {
@@ -342,6 +347,17 @@ public function getIsDynamicInclude(string $uri = null): bool
         return false;
     }
 
+    /**
+     * Returns whether this is a cacheable action request.
+     *
+     * @since 5.11.1
+     */
+    public function getIsCacheableActionRequest(): bool
+    {
+        return Craft::$app->getRequest()->getIsActionRequest()
+            && Blitz::$plugin->settings->cacheActionRequests;
+    }
+
     /**
      * Returns whether this is a generator request.
      *