update code

Author: rogerdz

app/code/Magento/PageCache/Model/App/Request/Http/IdentifierForSave.php

@@ -7,6 +7,7 @@
 
 namespace Magento\PageCache\Model\App\Request\Http;
 
+use Laminas\Uri\UriFactory;
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\PageCache\IdentifierInterface;
 use Magento\Framework\App\Request\Http;
@@ -63,7 +64,7 @@ private function reconstructUrl($url)
             return [$url, ''];
         }
         $baseUrl = strtok((string)$url, '?');
-        $query = $this->request->getQuery()->toArray();
+        $query = UriFactory::factory($url)->getQueryAsArray();
         if (!empty($query)) {
             ksort($query);
             $query = http_build_query($query);

lib/internal/Magento/Framework/App/PageCache/Identifier.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\App\PageCache;
 
+use Laminas\Uri\UriFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 
@@ -74,7 +75,7 @@ private function reconstructUrl($url)
             return [$url, ''];
         }
         $baseUrl = strtok((string)$url, '?');
-        $query = $this->request->getQuery()->toArray();
+        $query = UriFactory::factory($url)->getQueryAsArray();
         if (!empty($query)) {
             ksort($query);
             $query = http_build_query($query);