diff --git a/src/Cache/CacheManager.php b/src/Cache/CacheManager.php
index b22df30ffc..489af08a3b 100644
--- a/src/Cache/CacheManager.php
+++ b/src/Cache/CacheManager.php
@@ -55,7 +55,7 @@ public function createCacheKey(UriInterface $uri): string
     {
         $url = "{$uri->getHost()}{$uri->getPath()}";
 
-        return str_replace(['/', '.', '-', '@', '+'],'_',$url);
+        return preg_replace('/[^a-zA-Z0-9_\.!]/', '_', $url);
     }
 
     /**