diff --git a/apps/dashboard/src/lib/features/course/api/attendance.svelte.ts b/apps/dashboard/src/lib/features/course/api/attendance.svelte.ts
index 6ace4c1b..37b779bc 100644
--- a/apps/dashboard/src/lib/features/course/api/attendance.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/attendance.svelte.ts
@@ -63,4 +63,4 @@ export class AttendanceApi extends BaseApiWithErrors {
   }
 }
 
-export const attendanceApi = new AttendanceApi();
+export const attendanceApi = /* @__PURE__ */ new AttendanceApi();
diff --git a/apps/dashboard/src/lib/features/course/api/compliance.svelte.ts b/apps/dashboard/src/lib/features/course/api/compliance.svelte.ts
index aeaf3284..5592e857 100644
--- a/apps/dashboard/src/lib/features/course/api/compliance.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/compliance.svelte.ts
@@ -215,4 +215,4 @@ export class ComplianceApi extends BaseApiWithErrors {
   }
 }
 
-export const complianceApi = new ComplianceApi();
+export const complianceApi = /* @__PURE__ */ new ComplianceApi();
diff --git a/apps/dashboard/src/lib/features/course/api/content.svelte.ts b/apps/dashboard/src/lib/features/course/api/content.svelte.ts
index 7c20bc6f..5996907c 100644
--- a/apps/dashboard/src/lib/features/course/api/content.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/content.svelte.ts
@@ -59,4 +59,4 @@ export class ContentApi extends BaseApiWithErrors {
   }
 }
 
-export const contentApi = new ContentApi();
+export const contentApi = /* @__PURE__ */ new ContentApi();
diff --git a/apps/dashboard/src/lib/features/course/api/course-clone.svelte.ts b/apps/dashboard/src/lib/features/course/api/course-clone.svelte.ts
index 78f77ea2..dd46c309 100644
--- a/apps/dashboard/src/lib/features/course/api/course-clone.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/course-clone.svelte.ts
@@ -77,4 +77,4 @@ export class CourseCloneApi extends BaseApiWithErrors {
   }
 }
 
-export const courseCloneApi = new CourseCloneApi();
+export const courseCloneApi = /* @__PURE__ */ new CourseCloneApi();
diff --git a/apps/dashboard/src/lib/features/course/api/course.svelte.ts b/apps/dashboard/src/lib/features/course/api/course.svelte.ts
index 7c3bb214..66cca766 100644
--- a/apps/dashboard/src/lib/features/course/api/course.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/course.svelte.ts
@@ -754,4 +754,4 @@ export class CourseApi extends BaseApiWithErrors {
   }
 }
 
-export const courseApi = new CourseApi();
+export const courseApi = /* @__PURE__ */ new CourseApi();
diff --git a/apps/dashboard/src/lib/features/course/api/courses.svelte.ts b/apps/dashboard/src/lib/features/course/api/courses.svelte.ts
index ce2ab84d..ecb0768b 100644
--- a/apps/dashboard/src/lib/features/course/api/courses.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/courses.svelte.ts
@@ -171,4 +171,4 @@ export class CoursesApi extends BaseApiWithErrors {
   }
 }
 
-export const coursesApi = new CoursesApi();
+export const coursesApi = /* @__PURE__ */ new CoursesApi();
diff --git a/apps/dashboard/src/lib/features/course/api/exercise-template.svelte.ts b/apps/dashboard/src/lib/features/course/api/exercise-template.svelte.ts
index c2d0aebe..2223fac3 100644
--- a/apps/dashboard/src/lib/features/course/api/exercise-template.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/exercise-template.svelte.ts
@@ -70,4 +70,4 @@ class ExerciseTemplateApi extends BaseApi {
   }
 }
 
-export const exerciseTemplateApi = new ExerciseTemplateApi();
+export const exerciseTemplateApi = /* @__PURE__ */ new ExerciseTemplateApi();
diff --git a/apps/dashboard/src/lib/features/course/api/exercise.svelte.ts b/apps/dashboard/src/lib/features/course/api/exercise.svelte.ts
index 6a5e2d83..ee01054c 100644
--- a/apps/dashboard/src/lib/features/course/api/exercise.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/exercise.svelte.ts
@@ -328,4 +328,4 @@ export class ExerciseApi extends BaseApiWithErrors {
    */
 }
 
-export const exerciseApi = new ExerciseApi();
+export const exerciseApi = /* @__PURE__ */ new ExerciseApi();
diff --git a/apps/dashboard/src/lib/features/course/api/lesson.svelte.ts b/apps/dashboard/src/lib/features/course/api/lesson.svelte.ts
index f85b9ec6..2a362be9 100644
--- a/apps/dashboard/src/lib/features/course/api/lesson.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/lesson.svelte.ts
@@ -945,4 +945,4 @@ export class LessonApi extends BaseApiWithErrors {
   }
 }
 
-export const lessonApi = new LessonApi();
+export const lessonApi = /* @__PURE__ */ new LessonApi();
diff --git a/apps/dashboard/src/lib/features/course/api/mark.svelte.ts b/apps/dashboard/src/lib/features/course/api/mark.svelte.ts
index e847c464..1cfa7146 100644
--- a/apps/dashboard/src/lib/features/course/api/mark.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/mark.svelte.ts
@@ -35,4 +35,4 @@ export class MarkApi extends BaseApiWithErrors {
   }
 }
 
-export const markApi = new MarkApi();
+export const markApi = /* @__PURE__ */ new MarkApi();
diff --git a/apps/dashboard/src/lib/features/course/api/newsfeed.svelte.ts b/apps/dashboard/src/lib/features/course/api/newsfeed.svelte.ts
index d1e0ddf7..8f970680 100644
--- a/apps/dashboard/src/lib/features/course/api/newsfeed.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/newsfeed.svelte.ts
@@ -507,4 +507,4 @@ export class NewsfeedApi extends BaseApiWithErrors {
   }
 }
 
-export const newsfeedApi = new NewsfeedApi();
+export const newsfeedApi = /* @__PURE__ */ new NewsfeedApi();
diff --git a/apps/dashboard/src/lib/features/course/api/people.svelte.ts b/apps/dashboard/src/lib/features/course/api/people.svelte.ts
index 65f3384b..c3238c2f 100644
--- a/apps/dashboard/src/lib/features/course/api/people.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/people.svelte.ts
@@ -292,4 +292,4 @@ export class PeopleApi extends BaseApiWithErrors {
   }
 }
 
-export const peopleApi = new PeopleApi();
+export const peopleApi = /* @__PURE__ */ new PeopleApi();
diff --git a/apps/dashboard/src/lib/features/course/api/presign.svelte.ts b/apps/dashboard/src/lib/features/course/api/presign.svelte.ts
index 1f6e2d69..7dd017f9 100644
--- a/apps/dashboard/src/lib/features/course/api/presign.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/presign.svelte.ts
@@ -76,4 +76,4 @@ export class PresignApi extends BaseApiWithErrors {
   }
 }
 
-export const presignApi = new PresignApi();
+export const presignApi = /* @__PURE__ */ new PresignApi();
diff --git a/apps/dashboard/src/lib/features/course/api/submission.svelte.ts b/apps/dashboard/src/lib/features/course/api/submission.svelte.ts
index 6d7c9657..9e059b9e 100644
--- a/apps/dashboard/src/lib/features/course/api/submission.svelte.ts
+++ b/apps/dashboard/src/lib/features/course/api/submission.svelte.ts
@@ -159,4 +159,4 @@ export class SubmissionApi extends BaseApiWithErrors {
   }
 }
 
-export const submissionApi = new SubmissionApi();
+export const submissionApi = /* @__PURE__ */ new SubmissionApi();
diff --git a/apps/dashboard/src/routes/(app)/org/[slug]/courses/+page.svelte b/apps/dashboard/src/routes/(app)/org/[slug]/courses/+page.svelte
index 961a43c6..e8b18b91 100644
--- a/apps/dashboard/src/routes/(app)/org/[slug]/courses/+page.svelte
+++ b/apps/dashboard/src/routes/(app)/org/[slug]/courses/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import { CoursesPage } from '$features/course/pages';
-  import { CreateCourseButton, CourseFilterPopover } from '$features/course/components';
+  import CoursesPage from '$features/course/pages/courses.svelte';
+  import CreateCourseButton from '$features/course/components/create-course-button.svelte';
+  import CourseFilterPopover from '$features/course/components/course-filter-popover.svelte';
   import { courseMetaDeta } from '$features/course/utils/store';
   import {
     CourseSortBy,
@@ -15,7 +16,7 @@
   import { t } from '$lib/utils/functions/translations';
   import { onMount } from 'svelte';
   import * as Page from '@cio/ui/base/page';
-  import { coursesApi } from '$features/course/api';
+  import { coursesApi } from '$features/course/api/courses.svelte';
 
   let { data } = $props();
   const getInitialSelectedTags = () => data.activeTags ?? [];
diff --git a/apps/tenant-router/src/index.ts b/apps/tenant-router/src/index.ts
index dee51c7a..30460219 100644
--- a/apps/tenant-router/src/index.ts
+++ b/apps/tenant-router/src/index.ts
@@ -265,17 +265,23 @@ export default {
       upstreamHeaders.set('x-forwarded-for', clientIp);
     }
 
+    // SvelteKit's immutable chunk filenames include a content hash, so they are
+    // safe to cache at the edge forever. `cf.cacheEverything` is what actually
+    // populates Cloudflare's edge cache for this subrequest — setting a
+    // `Cache-Control` header on the response alone does NOT, so without this a
+    // cold browser cache (new device, or post-deploy hash change) stampedes the
+    // origin for every chunk.
+    const isImmutableAsset = url.pathname.startsWith('/_app/immutable/');
+
     const upstreamResponse = await fetch(upstreamUrl.toString(), {
       method: request.method,
       headers: upstreamHeaders,
       body: request.body,
-      redirect: 'manual'
+      redirect: 'manual',
+      cf: isImmutableAsset ? { cacheEverything: true, cacheTtl: 31536000 } : undefined
     });
 
-    // SvelteKit's immutable chunk filenames include a content hash, so they
-    // are safe to cache forever. Set a long TTL here at the edge so browsers
-    // and Cloudflare cache them aggressively rather than revalidating.
-    if (url.pathname.startsWith('/_app/immutable/')) {
+    if (isImmutableAsset) {
       const response = new Response(upstreamResponse.body, upstreamResponse);
       response.headers.set('Cache-Control', 'public, max-age=31536000, immutable');
       return response;