diff --git a/server/static/index.html b/server/static/index.html
index ef459be6b..0db2b14d6 100644
--- a/server/static/index.html
+++ b/server/static/index.html
@@ -27,14 +27,14 @@
       </div>
     </div>
     <script type="text/javascript">
-      // if ('serviceWorker' in navigator) {
-      //   navigator.serviceWorker.register('/service-worker.js')
-      //   .then(function(reg) {
-      //     console.log('SW registration succeeded');
-      //   }).catch(function(error) {
-      //     console.log('SW registration failed: ' + error);
-      //   });
-      // };
+      if ('serviceWorker' in navigator) {
+        navigator.serviceWorker.register('/service-worker.js')
+        .then(function(reg) {
+          console.log('SW registration succeeded');
+        }).catch(function(error) {
+          console.log('SW registration failed: ' + error);
+        });
+      };
     </script>
   </body>
 </html>
diff --git a/server/static/service-worker.js b/server/static/service-worker.js
index 6055deebc..858ca5456 100644
--- a/server/static/service-worker.js
+++ b/server/static/service-worker.js
@@ -59,21 +59,26 @@ Cache.prototype.addAll||(Cache.prototype.addAll=function(t){function e(t){this.n
   //   in the URL should be fine for this sample.
   // - toolbox.cacheFirst let us to use the predefined cache strategy for those
   //   requests.
-  global.toolbox.router.get(/\.ytimg\.com\//, global.toolbox.cacheFirst, {
-    // Use a dedicated cache for the responses, separate from the default cache.
-    cache: {
-      name: 'youtube-thumbnails',
-      // Store up to 10 entries in that cache.
-      maxEntries: 10,
-      // Expire any entries that are older than 30 seconds.
-      maxAgeSeconds: 30
-    }
-  });
+  // global.toolbox.router.get(/\.ytimg\.com\//, global.toolbox.cacheFirst, {
+  //   // Use a dedicated cache for the responses, separate from the default cache.
+  //   cache: {
+  //     name: 'youtube-thumbnails',
+  //     // Store up to 10 entries in that cache.
+  //     maxEntries: 10,
+  //     // Expire any entries that are older than 30 seconds.
+  //     maxAgeSeconds: 30
+  //   }
+  // });
 
-  // By default, all requests that don't match our custom handler will use the
-  // toolbox.networkFirst cache strategy, and their responses will be stored in
-  // the default cache.
-  global.toolbox.router.default = global.toolbox.networkFirst;
+  // Index page and assets
+  global.toolbox.router.get(/^\/$/, global.toolbox.cacheFirst);
+  global.toolbox.router.get(/^\/dashboard/, global.toolbox.cacheFirst);
+  global.toolbox.router.get(/\/static\//, global.toolbox.cacheFirst);
+
+  // API get calls
+  global.toolbox.router.get(/\/api\//, global.toolbox.networkFirst);
+
+  // global.toolbox.router.default = global.toolbox.networkFirst;
 
   // Boilerplate to ensure our service worker takes control of the page as soon
   // as possible.
@@ -81,4 +86,4 @@ Cache.prototype.addAll||(Cache.prototype.addAll=function(t){function e(t){this.n
       event => event.waitUntil(global.skipWaiting()));
   global.addEventListener('activate',
       event => event.waitUntil(global.clients.claim()));
-})(self);
\ No newline at end of file
+})(self);