diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 6993d1c..7af02c3 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -10,7 +10,9 @@ export const ssr = false;
 // since it's populated inside hooks.server.ts per request.
 // It will populate the "user" attribute of each page's "data" object,
 // so each page has access to the current user (or knows if no one is signed in).
-export const load: LayoutLoad = async () => {
+export const load: LayoutLoad = async ({ fetch, depends }) => {
+  depends("data:graphics");
+
   return {
     // User information (synchronous)
     user: pbUser,
diff --git a/src/routes/data/raceresults/+page.ts b/src/routes/data/raceresults/+page.ts
index 76aaa36..29a7204 100644
--- a/src/routes/data/raceresults/+page.ts
+++ b/src/routes/data/raceresults/+page.ts
@@ -1,7 +1,9 @@
 import { fetch_drivers, fetch_raceresults, fetch_races } from "$lib/fetch";
 import type { PageLoad } from "../../$types";
 
-export const load: PageLoad = async ({ fetch }) => {
+export const load: PageLoad = async ({ fetch, depends }) => {
+  depends("data:drivers", "data:races", "data:raceresults");
+
   return {
     drivers: fetch_drivers(fetch),
     races: fetch_races(fetch),
diff --git a/src/routes/data/season/drivers/+page.ts b/src/routes/data/season/drivers/+page.ts
index 7ebbafe..8e60b50 100644
--- a/src/routes/data/season/drivers/+page.ts
+++ b/src/routes/data/season/drivers/+page.ts
@@ -1,7 +1,9 @@
 import { fetch_drivers, fetch_teams } from "$lib/fetch";
 import type { PageLoad } from "../../../$types";
 
-export const load: PageLoad = async ({ fetch }) => {
+export const load: PageLoad = async ({ fetch, depends }) => {
+  depends("data:teams", "data:drivers");
+
   return {
     teams: fetch_teams(fetch),
     drivers: fetch_drivers(fetch),
diff --git a/src/routes/data/season/races/+page.ts b/src/routes/data/season/races/+page.ts
index 6495e41..041f89b 100644
--- a/src/routes/data/season/races/+page.ts
+++ b/src/routes/data/season/races/+page.ts
@@ -1,7 +1,9 @@
 import { fetch_races } from "$lib/fetch";
 import type { PageLoad } from "../../../$types";
 
-export const load: PageLoad = async ({ fetch }) => {
+export const load: PageLoad = async ({ fetch, depends }) => {
+  depends("data:races");
+
   return {
     races: fetch_races(fetch),
   };
diff --git a/src/routes/data/season/substitutions/+page.ts b/src/routes/data/season/substitutions/+page.ts
index 745bc5c..8abb21e 100644
--- a/src/routes/data/season/substitutions/+page.ts
+++ b/src/routes/data/season/substitutions/+page.ts
@@ -1,7 +1,9 @@
 import { fetch_drivers, fetch_races, fetch_substitutions } from "$lib/fetch";
 import type { PageLoad } from "../../../$types";
 
-export const load: PageLoad = async ({ fetch }) => {
+export const load: PageLoad = async ({ fetch, depends }) => {
+  depends("data:races", "data:drivers", "data:substitutions");
+
   return {
     races: fetch_races(fetch),
     drivers: fetch_drivers(fetch),
diff --git a/src/routes/data/season/teams/+page.ts b/src/routes/data/season/teams/+page.ts
index 1245332..07f6fc0 100644
--- a/src/routes/data/season/teams/+page.ts
+++ b/src/routes/data/season/teams/+page.ts
@@ -1,7 +1,9 @@
 import { fetch_teams } from "$lib/fetch";
 import type { PageLoad } from "../../../$types";
 
-export const load: PageLoad = async ({ fetch }) => {
+export const load: PageLoad = async ({ fetch, depends }) => {
+  depends("data:teams");
+
   return {
     teams: fetch_teams(fetch),
   };
diff --git a/src/routes/data/users/+page.ts b/src/routes/data/users/+page.ts
index 9832a8c..4f86935 100644
--- a/src/routes/data/users/+page.ts
+++ b/src/routes/data/users/+page.ts
@@ -1,7 +1,9 @@
 import { fetch_users } from "$lib/fetch";
 import type { PageLoad } from "../../$types";
 
-export const load: PageLoad = async ({ fetch }) => {
+export const load: PageLoad = async ({ fetch, depends }) => {
+  depends("data:users");
+
   return {
     users: await fetch_users(fetch),
   };
diff --git a/src/routes/racepicks/+page.ts b/src/routes/racepicks/+page.ts
index 3aee065..e893543 100644
--- a/src/routes/racepicks/+page.ts
+++ b/src/routes/racepicks/+page.ts
@@ -8,7 +8,16 @@ import {
 } from "$lib/fetch";
 import type { PageLoad } from "../$types";
 
-export const load: PageLoad = async ({ fetch }) => {
+export const load: PageLoad = async ({ fetch, depends }) => {
+  depends(
+    "data:racepicks",
+    "data:currentpickedusers",
+    "data:raceresults",
+    "data:drivers",
+    "data:races",
+    "data:currentrace",
+  );
+
   return {
     racepicks: fetch_racepicks(fetch),
     currentpickedusers: fetch_currentpickedusers(fetch),