wip

src/StaticCaching/Cachers/AbstractCacher.php

@@ -138,6 +138,13 @@ public function getUrl(Request $request)
     {
         $url = $request->getUri();
 
+        if ($recache = $request->input('__recache')) {
+            $url = str_replace('__recache='.$recache, '', $url);
+            if (substr($url, -1, 1) == '?') {
+                $url = substr($url, 0, -1);
+            }
+        }
+
         if ($this->config('ignore_query_strings')) {
             $url = explode('?', $url)[0];
         }

src/StaticCaching/Cachers/FileCacher.php

@@ -60,7 +60,7 @@ public function cachePage(Request $request, $content)
 
         $content = $this->normalizeContent($content);
 
-        $path = $this->getFilePath($request->getUri());
+        $path = $this->getFilePath($url);
 
         if (! $this->writer->write($path, $content, $this->config('lock_hold_length'))) {
             return;

src/StaticCaching/Middleware/Cache.php

@@ -129,7 +129,14 @@ private function shouldBeCached($request, $response)
         // POST requests to preview the changes. We don't want those to trigger any caching,
         // or else pending changes will be shown immediately, even without hitting save.
         if ($request->method() !== 'GET') {
-            return false;
+            if ($request->method() != 'PUT') {
+                return false;
+            }
+
+            // if we are not a recache attempt
+            if (! ($request->headers->has('X-Statamic-Recache') && $request->input('__recache'))) {
+                return false;
+            }
         }
 
         // Draft and private pages should not be cached.