diff --git a/themes/even/assets/js/service-worker-template.js b/themes/even/assets/js/service-worker-template.js
index c9f4b23..4faeb85 100644
--- a/themes/even/assets/js/service-worker-template.js
+++ b/themes/even/assets/js/service-worker-template.js
@@ -5,6 +5,8 @@ self.addEventListener('activate', event => {
             return Promise.all(
                 cacheNames.map(cacheName =>  caches.delete(cacheName)),
             );
+        }).then(() => {
+            self.registration.unregister();
         }),
     );
 });
@@ -39,9 +41,9 @@ self.addEventListener('fetch', event => {
         caches
             .match(event.request)
             .then(response => {
-                var skip = false;
+                var skip = event.request.url.startsWith('https://api.github.com');
 {{- if .Site.BuildDrafts -}}
-                skip = filesToCache.filter(name => event.request.url.endsWith(name)).length === 0;
+                skip ||= filesToCache.filter(name => event.request.url.endsWith(name)).length === 0;
 {{- end -}}
                 if (!skip && response) return response;
                 return fetch(event.request);
@@ -76,15 +78,14 @@ self.addEventListener('fetch', event => {
 
 // Delete outdated caches
 self.addEventListener('activate', event => {
-    const cacheWhitelist = [cacheName];
     event.waitUntil(
         caches.keys().then(cacheNames => {
             return Promise.all(
-                cacheNames.map(cacheName => {
-                    if (!cacheWhitelist.includes(cacheName)) {
-                        return caches.delete(cacheName);
-                    }
-                }),
+                cacheNames.filter(
+                    cacheName => cacheName !== cacheName
+                ).map(
+                    cacheName => caches.delete(cacheName)
+                ),
             );
         }),
     );
diff --git a/themes/even/layouts/partials/scripts.html b/themes/even/layouts/partials/scripts.html
index a300808..3527e5c 100644
--- a/themes/even/layouts/partials/scripts.html
+++ b/themes/even/layouts/partials/scripts.html
@@ -179,8 +179,13 @@
 {{- $serviceWorker := resources.Get "js/service-worker-template.js" | resources.ExecuteAsTemplate "service-worker.js" . -}}
 <script>
   if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.register('{{ $serviceWorker.Permalink }}').then(function() {
-      console.log('[ServiceWorker] Registered');
+    navigator.serviceWorker.getRegistrations().then(regs=>{
+        for (const reg of regs) {
+            reg.unregister();
+        }
+        navigator.serviceWorker.register('{{ $serviceWorker.Permalink }}').then(function() {
+            console.log('[ServiceWorker] Registered');
+        });
     });
   }
 </script>