diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7773e49bd..db078c7d5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,4 +104,4 @@ workflows:
             - build
           filters:
             branches:
-              only: master
+              only: fix/1482-first-render-issue
diff --git a/public/_headers b/public/_headers
new file mode 100644
index 000000000..42c9d72d7
--- /dev/null
+++ b/public/_headers
@@ -0,0 +1,11 @@
+/*
+  Cache-Control: no-cache
+
+/static/*
+  Cache-Control: public, max-age=31536000, immutable
+
+/*.js
+  Cache-Control: public, max-age=31536000, immutable
+
+/*.css
+  Cache-Control: public, max-age=31536000, immutable
diff --git a/public/_redirects b/public/_redirects
index 50a463356..bbb3e7a1f 100644
--- a/public/_redirects
+++ b/public/_redirects
@@ -1 +1 @@
-/*    /index.html   200
\ No newline at end of file
+/*  /index.html  200
diff --git a/sw-precache-config.js b/sw-precache-config.js
index 76e749f8d..90128f034 100644
--- a/sw-precache-config.js
+++ b/sw-precache-config.js
@@ -14,11 +14,6 @@ function mapImagesToGlobs(boards, globPrefix) {
       }
     });
   });
-  console.log(
-    globs.forEach(glob => {
-      console.log(glob);
-    })
-  );
   return globs;
 }
 
@@ -29,11 +24,21 @@ module.exports = {
   staticFileGlobs: [
     'build/*.html',
     'build/manifest.json',
-    'build/static/**/!(*map*)',
+    'build/static/**/*.*',
     ...boardImages
   ],
   maximumFileSizeToCacheInBytes: 4194304,
   runtimeCaching: [
+    {
+      urlPattern: /\/static\//,
+      handler: 'cacheFirst',
+      options: {
+        cache: {
+          name: 'static-assets',
+          maxEntries: 200
+        }
+      }
+    },
     {
       urlPattern: /\/symbols\/mulberry/,
       handler: 'cacheFirst',
@@ -62,10 +67,11 @@ module.exports = {
       }
     }
   ],
-  dontCacheBustUrlsMatching: /\.\w{8}\./,
+  navigateFallback: '/index.html',
+  navigateFallbackWhitelist: [/^\/(?!api).*/],
+  dontCacheBustUrlsMatching: /\.(js|css|json|jpg|jpeg|png|svg|ico)$/,
   dynamicUrlToDependencies: {
     '/': ['build/index.html']
   },
-  navigateFallback: '/',
   swFilePath: 'build/service-worker.js'
 };