diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js
index 531030bd..98c8c902 100755
--- a/src-pwa/custom-service-worker.js
+++ b/src-pwa/custom-service-worker.js
@@ -146,29 +146,40 @@ if (workbox) {
     console.log(event.data);
   });
 
-  self.addEventListener('fetch', (event) => {
-    if (event.request.cache === 'only-if-cached' && event.request.mode !== 'same-origin') return;
-
-    event.respondWith(async () => {
-      let cachedResponse = await caches.match(event.request);
-      if (cachedResponse) return cachedResponse;
-
+  self.addEventListener('fetch', function (event) {
+    console.log('[Service Worker] Fetching something ....', event);
+    console.log('event.request.cache=', event.request.cache)
+    if (event.request.cache === 'only-if-cached' && event.request.mode !== 'same-origin') {
+      console.log('SAME ORIGIN!', event);
+      return;
+    }
+    event.respondWith((async () => {
+      const cachedResponse = await caches.match(event.request);
+      if (cachedResponse) {
+        return cachedResponse;
+      }
+  
+      console.log('*** REQUEST', event.request);
       try {
         const response = await fetch(event.request);
-        if (!response || response.status !== 200 || response.type !== 'basic') return response;
-
-        if (ENABLE_DYNAMIC_CACHING) {
-          const cache = await caches.open(DYNAMIC_CACHE);
-          cache.put(event.request, response.clone());
+  
+        if (!response || response.status !== 200 || response.type !== 'basic') {
+          return response;
         }
-
+  
+        if (ENABLE_DYNAMIC_CACHING) {
+          const responseToCache = response.clone();
+          const cache = await caches.open(DYNAMIC_CACHE)
+          await cache.put(event.request, response.clone());
+        }
+  
         return response;
       } catch (e) {
         return '';
       }
-    });
+    })());
   });
-
+    
   self.addEventListener('sync', event => {
     console.log('[Service Worker V5] Background syncing', event);