diff --git a/apps/web/src/service-worker.ts b/apps/web/src/service-worker.ts
index e8cb86d1c..17f849cad 100644
--- a/apps/web/src/service-worker.ts
+++ b/apps/web/src/service-worker.ts
@@ -19,18 +19,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable no-var */
 /// <reference lib="webworker" />
 
-import { ExpirationPlugin } from "workbox-expiration";
 import {
   precacheAndRoute,
   createHandlerBoundToURL,
   cleanupOutdatedCaches
 } from "workbox-precaching";
+import { setCacheNameDetails } from "workbox-core";
 import { registerRoute } from "workbox-routing";
-import { StaleWhileRevalidate } from "workbox-strategies";
 import "./service-worker.dev.js";
 
 declare var self: ServiceWorkerGlobalScope & typeof globalThis;
 
+setCacheNameDetails({
+  prefix: IS_BETA ? "notesnook-beta" : "notesnook",
+  suffix: `${self.registration.scope}-${APP_VERSION}-${GIT_HASH}`,
+  precache: "precache",
+  runtime: "runtime"
+});
+
 cleanupOutdatedCaches();
 
 precacheAndRoute(self.__WB_MANIFEST);
@@ -59,19 +65,3 @@ registerRoute(
   },
   createHandlerBoundToURL(PUBLIC_URL + "/index.html")
 );
-
-// An example runtime caching route for requests that aren't handled by the
-// precache, in this case same-origin .png requests like those from in public/
-registerRoute(
-  // Add in any other file extensions or routing criteria as needed.
-  ({ url }) =>
-    url.origin === self.location.origin && url.pathname.endsWith(".png"), // Customize this strategy as needed, e.g., by changing to CacheFirst.
-  new StaleWhileRevalidate({
-    cacheName: "images",
-    plugins: [
-      // Ensure that once this runtime cache reaches a maximum size the
-      // least-recently used images are removed.
-      new ExpirationPlugin({ maxEntries: 50 })
-    ]
-  })
-);