diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7fbc90352..ac850ced5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,9 @@ and this project adheres to
 ### Fixed
 
 - 🐛(backend) duplicate sub docs as root for reader users
+- ⚗️(service-worker) remove index from cache first strategy #1395
 - 🐛(frontend) fix 404 page when reload 403 page #1402
+- 🐛(frontend) fix legacy role computation #1376
 
 ## [3.7.0] - 2025-09-12
 
@@ -47,7 +49,6 @@ and this project adheres to
 ### Fixed
 
 - 🐛(frontend) fix callout emoji list #1366
-- 🐛(frontend) fix legacy role computation #1376
 
 ## [3.6.0] - 2025-09-04
 
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts
index ef416fb93f..6540d54c10 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/doc-header.spec.ts
@@ -438,7 +438,9 @@ test.describe('Doc Header', () => {
 
     // Pin
     await page.getByText('push_pin').click();
-    await page.getByLabel('Open the document options').click();
+    await page
+      .getByRole('button', { name: 'Open the document options' })
+      .click();
     await expect(page.getByText('Unpin')).toBeVisible();
 
     await page.goto('/');
diff --git a/src/frontend/apps/e2e/__tests__/app-impress/utils-share.ts b/src/frontend/apps/e2e/__tests__/app-impress/utils-share.ts
index 5fe90a4816..5c2a5a33db 100644
--- a/src/frontend/apps/e2e/__tests__/app-impress/utils-share.ts
+++ b/src/frontend/apps/e2e/__tests__/app-impress/utils-share.ts
@@ -113,9 +113,12 @@ export const connectOtherUserToDoc = async (
   const otherPage = await otherContext.newPage();
   await otherPage.goto(docUrl);
 
-  await otherPage.getByRole('button', { name: 'Login' }).click({
-    timeout: 15000,
-  });
+  await otherPage
+    .getByRole('main', { name: 'Main content' })
+    .getByLabel('Login')
+    .click({
+      timeout: 15000,
+    });
 
   await keyCloakSignIn(otherPage, otherBrowserName, false);
 
diff --git a/src/frontend/apps/impress/src/features/service-worker/service-worker.ts b/src/frontend/apps/impress/src/features/service-worker/service-worker.ts
index 87693b6357..3e1f435785 100644
--- a/src/frontend/apps/impress/src/features/service-worker/service-worker.ts
+++ b/src/frontend/apps/impress/src/features/service-worker/service-worker.ts
@@ -15,6 +15,7 @@ import {
   NetworkFirst,
   NetworkFirstOptions,
   NetworkOnly,
+  StaleWhileRevalidate,
   StrategyOptions,
 } from 'workbox-strategies';
 
@@ -104,8 +105,6 @@ const FALLBACK = {
   images: '/assets/img-not-found.svg',
 };
 const precacheResources = [
-  '/',
-  '/index.html',
   '/401/',
   '/404/',
   FALLBACK.offline,
@@ -255,7 +254,7 @@ registerRoute(
  * Cache all other files
  */
 setDefaultHandler(
-  getStrategy({
+  new StaleWhileRevalidate({
     cacheName: getCacheNameVersion('default'),
     plugins: [
       new CacheableResponsePlugin({ statuses: [0, 200] }),