diff --git a/material/partials/javascripts/base.html b/material/partials/javascripts/base.html
index ffa05b19f..50373e85c 100644
--- a/material/partials/javascripts/base.html
+++ b/material/partials/javascripts/base.html
@@ -1,4 +1,4 @@
 {#-
   This file was automatically generated - do not edit
 -#}
-<script>function __md_scope(e,t,_){return new URL(_||(t===localStorage?"{{ config.extra.scope | d(base_url) }}":"{{ base_url }}"),location).pathname+"."+e}function __md_get(e,t=localStorage,_){return JSON.parse(t.getItem(__md_scope(e,t,_)))}function __md_set(e,t,_=localStorage,o){try{_.setItem(__md_scope(e,_,o),JSON.stringify(t))}catch(e){}}</script>
+<script>__md_scope=new URL("{{ config.extra.scope | d(base_url) }}",location),__md_get=(e,_=localStorage,t=__md_scope)=>JSON.parse(_.getItem(t.pathname+"."+e)),__md_set=(e,_,t=localStorage,a=__md_scope)=>{try{t.setItem(a.pathname+"."+e,JSON.stringify(_))}catch(e){}}</script>
diff --git a/src/partials/javascripts/base.html b/src/partials/javascripts/base.html
index f2fcd1db6..12884d959 100644
--- a/src/partials/javascripts/base.html
+++ b/src/partials/javascripts/base.html
@@ -26,25 +26,18 @@
 -->
 <script>
 
-  /* Prepend the base path to the given key to ensure uniqueness */
-  function __md_scope(key, storage, base) {
-    var prefix = new URL(base || (
-      storage === localStorage
-        ? "{{ config.extra.scope | d(base_url) }}"
-        : "{{ base_url }}"
-    ), location)
-    return prefix.pathname + "." + key
-  }
+  /* Compute base path once to integrate with instant loading */
+  __md_scope = new URL("{{ config.extra.scope | d(base_url) }}", location)
 
   /* Fetch the value for a key from the given storage */
-  function __md_get(key, storage = localStorage, base) {
-    return JSON.parse(storage.getItem(__md_scope(key, storage, base)))
-  }
+  __md_get = (key, storage = localStorage, scope = __md_scope) => (
+    JSON.parse(storage.getItem(scope.pathname + "." + key))
+  )
 
   /* Persist a key-value pair in the given storage */
-  function __md_set(key, value, storage = localStorage, base) {
+  __md_set = (key, value, storage = localStorage, scope = __md_scope) => {
     try {
-      storage.setItem(__md_scope(key, storage, base), JSON.stringify(value))
+      storage.setItem(scope.pathname + "." + key, JSON.stringify(value))
     } catch (err) {
       /* Uncritical, just swallow */
     }