diff --git a/src/Cache.php b/src/Cache.php
index f9701b0..7548add 100644
--- a/src/Cache.php
+++ b/src/Cache.php
@@ -202,8 +202,9 @@ protected function getDirectoryAndFileNames($request, $response)
         $extension = $this->guessFileExtension($response);
 
         $file = "{$filename}.{$extension}";
+        $path = urldecode($this->getCachePath(implode('/', $segments)));
 
-        return [$this->getCachePath(implode('/', $segments)), $file];
+        return [$path, $file];
     }
 
     /**
@@ -214,7 +215,7 @@ protected function getDirectoryAndFileNames($request, $response)
      */
     protected function aliasFilename($filename)
     {
-        return $filename ?: 'pc__index__pc';
+        return urldecode($filename) ?: 'pc__index__pc';
     }
 
     /**