Store Url fixes

Author: kandy

app/code/Magento/Store/Model/Store.php

@@ -17,6 +17,7 @@
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Url\ModifierInterface;
 use Magento\Framework\Url\ScopeInterface as UrlScopeInterface;
 use Magento\Framework\UrlInterface;
@@ -43,7 +44,8 @@ class Store extends AbstractExtensibleModel implements
     AppScopeInterface,
     UrlScopeInterface,
     IdentityInterface,
-    StoreInterface
+    StoreInterface,
+    ResetAfterRequestInterface
 {
     /**
      * Store Id key name
@@ -1421,4 +1423,17 @@ public function __debugInfo()
     {
         return [];
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_baseUrlCache = [];
+        $this->_configCache = null;
+        $this->_configCacheBaseNodes = [];
+        $this->_dirCache = [];
+        $this->_urlCache = [];
+        $this->_baseUrlCache = [];
+    }
 }

lib/internal/Magento/Framework/App/Request/Http.php

@@ -458,5 +458,6 @@ public function _resetState(): void
         $this->headers = null;
         $this->metadata = [];
         $this->content = '';
+        $this->distroBaseUrl = null;
     }
 }