diff --git a/README.md b/README.md
index d72b90c..b485973 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,3 @@
-<!--![](https://i.imgur.com/YwwLUd5.png)-->
-
-## Demo
-
-**Click image to watch plugin at work**
-
-[![See on youtube](https://img.youtube.com/vi/XyNy90px5Lk/0.jpg)](https://www.youtube.com/watch?v=XyNy90px5Lk)
-
 ### What is all the buzz about
 What is PWA? Why PWA?.... Before answering that let's have a look at how a user interacts with the digital world. As per study users usually spend 13% of their time on the web and 87% of that on Native apps due to their capabilities like push notification that brings the user back. So does that mean to abandon the web completely? Well... not exactly whereas the user spends most of the time on native apps but when it comes to reachability web surpasses native apps. On an average user installs ZERO apps per month where visits hundreds of websites at the same time. So if your app is not in users' top choice you can forget about it. This gap between native apps' capability and the web's reachability is covered by PWA.
 
@@ -38,6 +30,7 @@ The full case study at [Lancôme rebuilds their mobile website as a PWA](https:/
 - HTTPS-enabled website
 - **Important** PWA icons see [Generating and adding PWA icons](https://vsanse.github.io/plugin_sf_pwa/#generating-and-adding-pwa-icons)
 
+
 ### Cartridge Download
 
 1. Get the latest version from [Releases](https://github.com/vsanse/plugin_sf_pwa/releases)
@@ -56,16 +49,7 @@ The full case study at [Lancôme rebuilds their mobile website as a PWA](https:/
 	```
 	<isinclude template="pwa/register"/>
 	```
-4. Add new property file named pwa.properties to your site cartridge to update manifest.json file with your site name, theme, icons and To updated offline fallback page for your site.
-5. **[Optional]** Add new template "pwa/static_assets.isml" if you want to override cache file on the first load and add pages to be cached in Service worker in form of an array: e.g:
-	```
-	[
-        "${URLUtils.https("Pwa-Offline")}",<=== [MANDATORY TO ADD IN THIS FILE IF OVERRIDING]
-        "${URLUtils.staticURL('/css/app.min.css')}",
-        "${URLUtils.staticURL('/js/app.min.js')}"
-    ]
-    ```
-6. **[Optional]** You may want to design your own offline page so create new template "pwa/offline.isml" in your site cartridge it will override default offline template in plugin cartridge.
+4.  **[Optional]** Add new property file named pwa.properties to your site cartridge to update manifest.json file with your site name, theme, icons and To updated offline fallback page for your site.
 
 
 ### Generating and adding PWA icons
@@ -80,7 +64,7 @@ The full case study at [Lancôme rebuilds their mobile website as a PWA](https:/
 3. Now copy generated icons folder to "[Your site Cartridge]/static/default/images/"
 
 ### Features
-1. #### Extend Manifest and Service worker
+1. #### Extend Manifest 
     Feeling adventurous? Want to add more cool functionalities to your PWA?
 
     + **To add more configurations to your manifest.json:**
@@ -90,86 +74,20 @@ The full case study at [Lancôme rebuilds their mobile website as a PWA](https:/
             ```
         2. Create file **manifest_extended.isml** under **pwa** folder in templates of your site cartridge
 
-    + **To add more functionalities to your service worker:**
-        1. In your site cartridge's pwa.properties file add the line
-            ```
-            pwa.app.sw.extended=true
-            ```
-        2. Create file **sw_extended.isml** under **pwa** folder in templates of your site cartridge
-
-    + **To override fetch method of service worker**
-        1. In your site cartridge's pwa.properties file add the line
-            ```
-            pwa.app.sw.fetch.override=true
-            ```
-        2. Create file **sw_fetch_override.isml** under **pwa** folder in templates of your site cartridge
-
-        
-2. #### SkipWaiting(): to ensures any new versions of a service worker take over the page and become activated immediately.
-    **Note:** This is true by default so you may not need to add this line to your site cartridge's pwa.properties file
-    ```
-    pwa.app.skipWaiting=true
-    ```
-3. #### Choose your cache strategy
-    Currently, you have a choice of 3 types of cache strategies.
-    Cache Strategy can be defined using keywords  Cache First=CF, Network First=NF, Cache Then Network=CTN. For e.g.
-    ```
-    pwa.app.sw.cahe.strategy=CTN
-    ```
-    **Note** CTN is default and recommended cache strategy so you may not need to add this line to your site cartridge's pwa.properties file unless you want to override it.
-    
-    In CTN strategy every fetch request in service woker is first checked if it exists in cache if it does it will be served from there and if it doesn't then depending on your [opaque request handling](https://vsanse.github.io/plugin_sf_pwa/#handling-opaque-third-party-responses) it is served from network and cached at the same time. In case both of the above fails say request doesn't exists in cache and you are offline then it will fallback to generic error template defined by "Pwa-Offline" controller which you can override in your site cartridge for better UI/UX.
-    
-4. #### Handling opaque/ third party responses
-    By default plugin prevent any third party request being cached and is recommended as every third party request may generate a response of type opaque which causes it to get a minimum 7MB storage space in the cache, more at [https://cloudfour.com/thinks/when-7-kb-equals-7-mb/](https://cloudfour.com/thinks/when-7-kb-equals-7-mb/)
-    . Although it is recommended to not allow opaque response being cached you can allow it using 
-    ```
-    pwa.app.no.opaque.cache=false
-    ```
-    **Recommended way**:
-    + Keep no opaque cache property as true in PWA.properties [default plugin behavior].
-    + Opt-in to CORS mode: if your third-party CDNs all seem to support CORS, you could opt-in to CORS mode for your CSS and image requests via the [crossorigin](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link#attr-crossorigin) attribute, and the responses will no longer be opaque.
-    + Add any third party request you want to cache to "static_assets.isml"
-    + **Update:** Now you can whitelist your third party requests in service worker by adding them in the array "pwa.app.opaque.whitelist" in "pwa.properties" file.
-	```
-	# If you need some opaque third party request to be cached you 
-	# can either whitelist full domain by adding only origin say: "https://www.example.com" 
-	# or you can whitelist only a specific request by using 
-	# full url: "https://example.com/image/250x250" to the array
-
-	pwa.app.opaque.whitelist=["https://www.example.com", "https://example.com/image/250x250"]
-	```
-5. #### Handling default app install behaviour
+2. #### Handling default app install behaviour
     From version [v1.3](https://github.com/vsanse/plugin_sf_pwa/releases) you can prevent default [mini-infobar](https://developers.google.com/web/fundamentals/app-install-banners#mini-info-bar) from appearing by using 
     ```
     pwa.app.preventadd2hs=true	
     ```
     If you decide to use above property, be sure to provide some [indication](https://vsanse.github.io/plugin_sf_pwa/#windowadd2hs-to-rescue) to the user that your Progressive Web App is installable.
 	
-6. #### window.add2hs to rescue
+3. #### window.add2hs to rescue
    From version [v1.3](https://github.com/vsanse/plugin_sf_pwa/releases) window object will have event add2hs which can be used to prompt user to install PWA using `window.add2hs.prompt()`. You can setup some [button or banner](https://developers.google.com/web/fundamentals/app-install-banners/promoting-install-mobile) to indicate user that your PWA is installable on click of which you can trigger `window.add2hs.prompt()` to prompt user to install PWA.
-7. #### exclude requests from cache
-    From version [v1.4](https://github.com/vsanse/plugin_sf_pwa/releases) you can define all the urls that you want to exclude form cache in `excludes.isml`. If you wish to turn this feature off you can use `pwa.properties` and make `pwa.app.allow.excluding` false. 
-
-    **Note:** By default cartridge will exclude `Login-Show` and `Cart-Show` from cache. 
-
-<!-- ### Using with SFRA
-
-Copy code from "controllers/Pwa-SFRA.txt" and replace code in Pwa.js under controllers folder in plugin -->
-
-### Upcoming updates:
-
-+ Ability to show progress bar on click in app
-+ ~~Ability to show button inside web page to trigger app install~~ Available from [v1.3](https://github.com/vsanse/plugin_sf_pwa/releases) 
-+ Any other suggestion you might have :smiley:
 
 ### For support and feedback:
 Contact at Linkedin: 
 
 [Vishal Sanserwal](https://linkedin.com/in/vishal-sanserwal)
 
-[Abhinav Tripathi](https://www.linkedin.com/in/abhinav-tripathi-06a2a642/)
-
-[Himanshu Kumar](https://www.linkedin.com/in/himaanshu24/)
 
 
diff --git a/cartridges/plugin_sf_pwa/cartridge/static/default/js/registerSW.js b/cartridges/plugin_sf_pwa/cartridge/static/default/js/registerSW.js
deleted file mode 100644
index a3f962c..0000000
--- a/cartridges/plugin_sf_pwa/cartridge/static/default/js/registerSW.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var swscript = document.getElementById("sw");
-
-if ("serviceWorker" in navigator) {
-    if (navigator.serviceWorker.controller) {
-        console.log("Active service worker found, no need to register");
-    } else {
-        // Register the service worker
-        navigator.serviceWorker
-        .register(swscript.getAttribute('data-swurl'))
-        .then(function (reg) {  
-            console.log("Service worker has been registered");
-        });
-    }
-}
-
-/**
- * Add install PWA event to window which can be triggered when required
- */
-window.addEventListener('beforeinstallprompt', (evt) => {
-    // hide default prompt app install banner
-    if(swscript.getAttribute("data-preventadd2hs") === "true"){
-        evt.preventDefault()
-    }
-    // Stash the event so it can be triggered later.
-    window.add2hs = evt;
-});
\ No newline at end of file
diff --git a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/excludes.isml b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/excludes.isml
deleted file mode 100644
index e336a31..0000000
--- a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/excludes.isml
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-    "${URLUtils.https("Account-Me")}",
-    "${URLUtils.https("Cart-Show")}",
-    "${URLUtils.https("Cart-Get")}",
-    "${URLUtils.https("Cart-AddCoupon")}",
-    "${URLUtils.https("Cart-RemoveCouponLineItem")}",
-    "${URLUtils.https("Login-Logout")}"
-]
\ No newline at end of file
diff --git a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/manifest.isml b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/manifest.isml
index e873bde..d2822cc 100644
--- a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/manifest.isml
+++ b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/manifest.isml
@@ -13,12 +13,14 @@
     {
       "src": "<isprint value="${Resource.msgf('pwa.app.manifest-icon-192','pwa',null, siteid)}"/>",
       "sizes": "192x192",
-      "type": "image/png"
+      "type": "image/png",
+      "purpose": "any maskable"
     },
     {
       "src": "<isprint value="${Resource.msgf('pwa.app.manifest-icon-512','pwa',null, siteid)}"/>",
       "sizes": "512x512",
-      "type": "image/png"
+      "type": "image/png",
+      "purpose": "any maskable"
     }
   ]
   <isif condition="${Resource.msg('pwa.app.manifest.extended','pwa',null)==="true"}">
diff --git a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/offline.isml b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/offline.isml
index 26a9ef7..a700654 100644
--- a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/offline.isml
+++ b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/offline.isml
@@ -1 +1,47 @@
-<p>Seems Like you are offline</p>
\ No newline at end of file
+<iscontent type="text/html" charset="UTF-8" compact="true"/>
+
+<isinclude template="/components/modules" sf-toolkit="off" />
+
+<!DOCTYPE html>
+<html lang="${require('dw/util/Locale').getLocale(request.getLocale()).getLanguage()}">
+    <head>
+        <!--[if gt IE 9]><!-->
+            <isinclude sf-toolkit="off" template="/common/scripts" />
+        <!--<![endif]-->
+        <isinclude template="/common/htmlHead" />
+        <isactivedatahead/>
+        <style>
+            .brand {
+                position: static !important;
+                margin: 0 auto !important;
+                padding: 0.5rem !important;
+            }
+        </style>
+    </head>
+    <body>
+        ${dw.system.HookMgr.callHook('app.template.beforeHeader', 'beforeHeader', pdict) || ''}
+
+        <div class="page">
+            <isinclude template="/components/header/pageHeaderNomenu" />
+            <div role="main" id="maincontent">
+                <div class="container mb-5">
+                    <div class="row pt-5">
+                        <div class="col-12">
+                            <h1 class="text-center">
+                                Seems like you are offline
+                            </h1>
+                        </div>
+                        <div class="col-12 text-center">
+                            <a class="btn btn-primary" href="${URLUtils.https('Home-Show')}">Go Home</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <isinclude template="/components/footer/pageFooter" />
+        </div>
+        <!--[if lt IE 10]>
+            <isinclude sf-toolkit="off" template="/common/scripts" />
+        <![endif]-->
+
+    </body>
+</html>
diff --git a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/register.isml b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/register.isml
index 81141e5..8c5ede6 100755
--- a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/register.isml
+++ b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/register.isml
@@ -50,5 +50,36 @@
 <link rel="apple-touch-startup-image" href="${Resource.msgf('pwa.app.apple.spash.2732-2048', 'pwa', null, siteid)}"
     media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)">
 
-<script id="sw" src="${URLUtils.staticURL("js/registerSW.js")}" data-swurl="${URLUtils.https('Pwa-SW').toString()}"
-    data-preventadd2hs="${Resource.msg('pwa.app.preventadd2hs', 'pwa', null)}" ></script>
\ No newline at end of file
+<isset name="swurl" value="${URLUtils.https('Pwa-SW').toString()}" scope="page" />
+<isset name="preventadd2hs" value="${Resource.msg('pwa.app.preventadd2hs', 'pwa', null)}" scope="page" />
+
+
+<script>
+if ("serviceWorker" in navigator) {
+    if (navigator.serviceWorker.controller) {
+        console.log("Active service worker found, no need to register");
+    } else {
+        // Register the service worker
+        navigator.serviceWorker
+        .register("${swurl}")
+        .then(function (registration) {  
+            console.log("Service Worker registered! Scope:", registration.scope);
+        })
+        .catch(function (err) {
+            console.log("Service Worker registration failed:", err);
+        });
+    }
+}
+
+/**
+ * Add install PWA event to window which can be triggered when required
+ */
+window.addEventListener('beforeinstallprompt', (evt) => {
+    // hide default prompt app install banner
+    if(${preventadd2hs} === true){
+        evt.preventDefault()
+    }
+    // Stash the event so it can be triggered later.
+    window.add2hs = evt;
+});
+</script>
\ No newline at end of file
diff --git a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/static_assets.isml b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/static_assets.isml
deleted file mode 100644
index 722031f..0000000
--- a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/static_assets.isml
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-    "${URLUtils.https("Pwa-Offline")}"
-]
\ No newline at end of file
diff --git a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/sw.isml b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/sw.isml
index 9be79f8..989e139 100644
--- a/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/sw.isml
+++ b/cartridges/plugin_sf_pwa/cartridge/templates/default/pwa/sw.isml
@@ -1,146 +1,112 @@
-<iscontent type="application/javascript" charset="UTF-8" compact="true"/>
-// This is the 'Offline page' service worker
-const CACHE = "pwa-<isprint value="${require('dw/system/Site').getCurrent().getID()}" encoding="off" />";
+<iscontent type="application/javascript" charset="UTF-8" compact="true" />
+importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
 
-// TODO: Handle offline fallback functionality;
-const offlineFallbackPage = "${URLUtils.https("Pwa-Offline")}";
-const staticAssets = <isinclude template="pwa/static_assets" />
-const excludedPages = <isinclude template="pwa/excludes"/>
+var OFFLINE_CACHE = 'offline-html';
+var FALLBACK_HTML_URL = "${URLUtils.https("Pwa-Offline")}"
 
-// Install stage sets up the offline page in the cache and opens a new cache
 self.addEventListener('install', function (event) {
   console.log('Install Event processing');
-  
-  <iscomment> Allow skip waiting for updated worker: default = true </iscomment>
-  <isif condition="${Resource.msg('pwa.app.skipWaiting','pwa',null)==="true"}">
   self.skipWaiting();
-  </isif>
-
-  event.waitUntil(
-    caches.open(CACHE).then(function (cache) {
-      console.log('Cached offline page during install');
-      return cache.addAll(staticAssets.map(url => new Request(url, {credentials: 'same-origin'})));
-    })
-  );
+  var urls = [FALLBACK_HTML_URL];
+  event.waitUntil(caches.open(OFFLINE_CACHE).then((cache) => cache.addAll(urls)));
 });
 
-self.addEventListener('activate', function (event) {
-  event.waitUntil(
-    caches.keys().then(function(cacheNames) {
-      return Promise.all(
-        cacheNames.filter(function(cacheName) {
-          // Return true if you want to remove this cache,
-          // but remember that caches are shared across
-          // the whole origin
-          // return cacheName === CACHE
-        }).map(function(cacheName) {
-          return caches.delete(cacheName);
-        })
-      );
-    })
-  );
-});
+if (workbox) {
+  console.log(`Yay! Workbox is loaded 🎉`);
+} else {
+  console.log(`Boo! Workbox didn't load 😬`);
+}
+var { strategies } = workbox;
+var { NetworkOnly } = strategies;
 
-<isif condition="${Resource.msg('pwa.app.sw.fetch.override','pwa',null)==="true"}">
-    <isinclude template="pwa/sw_fetch_override" />
-  <iselse/>
-  // If any fetch fails, it will show the offline page.
-  self.addEventListener('fetch', function (event) {
-    if (event.request.method !== 'GET') return;
-    var whitelistOpaque = <isprint value="${Resource.msg('pwa.app.opaque.whitelist','pwa',null)}" encoding="off"/>
-    var useWhitelisting = whitelistOpaque.length > 0?true:false;
-    var allowExcluding = <isprint value="${Resource.msg('pwa.app.allow.excluding','pwa',null)}" encoding="off"/>
-    <isif condition="${Resource.msg('pwa.app.sw.cahe.strategy','pwa',null)==="CF"}">
-     /**
-     * Fetch from cache first if fails get from network, if both fails shoe generic offline page
-     */
-    event.respondWith(
-      caches.match(event.request).then(function(response) {
-        return response || fetch(event.request);
-      }).catch(function() {
-        if(offlineFallbackPage){
-          // If both fail, show a generic fallback:
-          return caches.match(offlineFallbackPage);
-        }
-      })
-    )
-    <iselseif condition="${Resource.msg('pwa.app.sw.cahe.strategy','pwa',null)==="NF"}" >
-    /**
-     * Fetch from network first if fails check cache, if both fails shoe generic offline page
-     */
-    event.respondWith(
-      fetch(event.request).catch(function() {
-        return caches.match(event.request).catch(function() {
-          if(offlineFallbackPage){
-            // If both fail, show a generic fallback:
-            return caches.match(offlineFallbackPage);
-          }
-        })
-      })
-    )
-    </iselseif>
-    <iselse/>
-    /**
-     * Check cache for requested page if not found get it from network and cache at the same time
-     * if both fails shoe generic offline page
-     */
-    event.respondWith(
-      caches.open(CACHE).then(function(cache){
-        return cache.match(event.request).then(function(response){
-          var fetchPromise = fetch(event.request).then(function(networkResponse){
-            
-            <isif condition="${Resource.msg('pwa.app.no.opaque.cache','pwa',null)==="true"}">
-              var requestUrl = new URL(event.request.url);
+workbox.navigationPreload.enable();
+var networkOnly = new NetworkOnly();
+var navigationHandler = async (params) => {
+  try {
+    // Attempt a network request.
+    return await networkOnly.handle(params);
+  } catch (error) {
+    // If it fails, return the cached HTML.
+    return caches.match(FALLBACK_HTML_URL, {
+      cacheName: OFFLINE_CACHE,
+    });
+  }
+};
 
-              if (networkResponse.type == "opaque" && networkResponse.status == 0) {
-                if(useWhitelisting && (whitelistOpaque.includes(requestUrl.origin)|| whitelistOpaque.includes(requestUrl.href))){
-                  cache.put(event.request, networkResponse.clone());
-                }
-              } else if(allowExcluding) {
-                if(!excludedPages.includes(requestUrl.href)){
-                  cache.put(event.request, networkResponse.clone());
-                }
-              }
-              else {
-                cache.put(event.request, networkResponse.clone());
-              }
-            <iselse/>  
-                if(allowExcluding) {
-                  if(!excludedPages.includes(requestUrl.href)){
-                    cache.put(event.request, networkResponse.clone());
-                  }
-                }
-                else {
-                  cache.put(event.request, networkResponse.clone());
-                }
-            </isif>
-            return networkResponse;
-          })
-          return response || fetchPromise;
-        }).catch(function() {
-          if(offlineFallbackPage){
-            // If both fail, show a generic fallback:
-            return caches.match(offlineFallbackPage);
-          }
-        })
-      })
-    )
-    </isif>
-  });
-</isif>
+// Register this strategy to handle all navigations.
+workbox.routing.registerRoute(
+  new workbox.routing.NavigationRoute(navigationHandler)
+);
 
-// This is an event that can be fired from your page to tell the SW to update the offline page
-self.addEventListener('refreshOffline', function () {
-  const offlinePageRequest = new Request(offlineFallbackPage);
+// Google Fonts
+workbox.routing.registerRoute(
+  function ({ url }) {
+    return url.origin === 'https://fonts.googleapis.com' ||
+      url.origin === 'https://fonts.gstatic.com';
+  },
+  new workbox.strategies.StaleWhileRevalidate({
+    cacheName: 'google-fonts',
+    plugins: [
+      new workbox.expiration.ExpirationPlugin({
+        maxEntries: 30,
+      }),
+      new workbox.cacheableResponse.CacheableResponsePlugin({
+        statuses: [0, 200]
+      }),
+    ],
+  }),
+);
+
+// Custom fonts
+workbox.routing.registerRoute(
+  function ({ request }) {
+    return request.destination === 'font';
+  },
+  new workbox.strategies.StaleWhileRevalidate({
+    cacheName: 'custom-fonts',
+    plugins: [
+      new workbox.expiration.ExpirationPlugin({
+        maxEntries: 30,
+      }),
+      new workbox.cacheableResponse.CacheableResponsePlugin({
+        statuses: [0, 200]
+      }),
+    ],
+  }),
+);
+
+// JS & CSS
+workbox.routing.registerRoute(
+  function ({ request }) {
+    return request.destination === 'script' ||
+      request.destination === 'style';
+  },
+  new workbox.strategies.StaleWhileRevalidate({
+    cacheName: 'styles-scripts-cache',
+    plugins: [
+      new workbox.expiration.ExpirationPlugin({
+        maxEntries: 50,
+        maxAgeSeconds: 30 * 24 * 60 * 60, // 30 Days
+      })
+    ]
+  })
+);
 
-  return fetch(offlineFallbackPage).then(function (response) {
-    return caches.open(CACHE).then(function (cache) {
-      console.log('Offline page updated from refreshOffline event: ' + response.url);
-      return cache.put(offlinePageRequest, response);
-    });
-  });
-});
 
-<isif condition="${Resource.msg('pwa.app.sw.extended','pwa',null)==="true"}">
-  <isinclude template="pwa/sw_extended" />
-</isif>
\ No newline at end of file
+// Cache images
+workbox.routing.registerRoute(
+  function ({ request }) {
+    return request.destination === 'image';
+  },
+  new workbox.strategies.CacheFirst({
+    cacheName: 'images-cache',
+    plugins: [
+      new workbox.cacheableResponse.CacheableResponsePlugin({
+        statuses: [0, 200]
+      }),
+      new workbox.expiration.ExpirationPlugin({
+        maxAgeSeconds: 30 * 24 * 60 * 60, // 30 Days
+      })
+    ]
+  })
+);
\ No newline at end of file
diff --git a/cartridges/plugin_sf_pwa/cartridge/templates/resources/pwa.properties b/cartridges/plugin_sf_pwa/cartridge/templates/resources/pwa.properties
index f6cf650..1670bb6 100644
--- a/cartridges/plugin_sf_pwa/cartridge/templates/resources/pwa.properties
+++ b/cartridges/plugin_sf_pwa/cartridge/templates/resources/pwa.properties
@@ -34,26 +34,5 @@ pwa.app.apple.spash.2732-2048=/on/demandware.static/Sites-{0}-Site/-/default/ima
 # if you want to add more properties to manifest.json, make this true and add properties to file: pwa/manifest_extended.isml
 pwa.app.manifest.extended=false
 
-# Service worker configs
-pwa.app.cache.name=pwa-sf
-pwa.app.skipWaiting=true
-
-# if you want to add more functionalities to service worker, make this true and add functionlities to file: pwa/sw_extended.isml
-pwa.app.sw.extended=false
-
-# if you want to add more functionalities to service worker, make this true and add functionlities to file: pwa//sw_fetch_override.isml, Check more about this at https://developers.google.com/web/ilt/pwa/caching-files-with-service-worker
-pwa.app.sw.fetch.override=false
-
-# Define your cache policy here. Cache First=CF, Network First=NF, Cache Then Network=CTN
-pwa.app.sw.cahe.strategy=CTN
-
-# This prevent your cache from being flooded with third party responses. learn more at: https://cloudfour.com/thinks/when-7-kb-equals-7-mb/
-pwa.app.no.opaque.cache=true
-# If you need some opaque third party request to be cached you can whitelist them here by either adding only origin say: "https://www.example.com" or using full url: "https://example.com/image/250x250" to the array
-pwa.app.opaque.whitelist=[]
-
 # You can prevent default install minbar by setting this flag true. Lear more at https://developers.google.com/web/fundamentals/app-install-banners#mini-info-bar
 pwa.app.preventadd2hs=false
-
-# this will allow exluding urls defined in excludes.isml from cache. It is used to prevent CSRF validation issues on Login & Checkout pages by default
-pwa.app.allow.excluding=true
\ No newline at end of file
diff --git a/data/sites/yourSiteId/url-rules.xml b/data/sites/yourSiteId/url-rules.xml
index d15f945..8c848d1 100644
--- a/data/sites/yourSiteId/url-rules.xml
+++ b/data/sites/yourSiteId/url-rules.xml
@@ -3,5 +3,11 @@
     <pipeline-aliases xml:lang="x-default">
         <pipeline-alias pipeline="Pwa-Manifest">manifest</pipeline-alias>
         <pipeline-alias pipeline="Pwa-SW">sw</pipeline-alias>
+        <pipeline-alias pipeline="Checkout-Login">checkout-start</pipeline-alias>
+        <pipeline-alias pipeline="Checkout-Begin">checkout</pipeline-alias>
+        <pipeline-alias pipeline="Cart-Show">cart</pipeline-alias>
+        <pipeline-alias pipeline="Login-Show">login</pipeline-alias>
+        <pipeline-alias pipeline="Home-Show">home</pipeline-alias>
+        <pipeline-alias pipeline="Account-Show">account</pipeline-alias>
     </pipeline-aliases>
 </url-rules>