diff --git a/src/lib/components/layout/main/DynamicLinks.svelte b/src/lib/components/layout/main/DynamicLinks.svelte
index dfe1e47..b843145 100644
--- a/src/lib/components/layout/main/DynamicLinks.svelte
+++ b/src/lib/components/layout/main/DynamicLinks.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
   import { fade } from "svelte/transition";
+  import { onMount } from "svelte";
   import { ArchiveCard } from "$components/archive";
+  import { getCache, setCache } from "$utils/cache";
   import type { LinkBoard } from "$components/shared";
 
   // Export the data prop that will receive the fetched links
@@ -8,20 +10,51 @@
   
   // Add loading state tracking
   let isVisible = false;
+  let cachedData: LinkBoard | undefined;
+  let hasCachedData = false;
   
-  // Show content with a small delay for better perceived performance
-  $: if (data) {
-    setTimeout(() => {
+  // Cache key for dynamic links
+  const CACHE_KEY = 'dynamic_links_data';
+  const CACHE_TTL = 3600000; // 1 hour in milliseconds
+  
+  onMount(() => {
+    // Try to load from cache first
+    const cached = getCache<LinkBoard>(CACHE_KEY);
+    if (cached && cached.cards && cached.cards.length > 0) {
+      cachedData = cached;
+      hasCachedData = true;
+      isVisible = true; // Show cached data immediately
+    } else {
+      // No valid cached data, show component (might show placeholder)
       isVisible = true;
-    }, 100);
-  } else {
-    isVisible = true; // Show placeholder immediately
+    }
+  });
+  
+  // Watch for data changes and update cache
+  $: if (data && data.cards && data.cards.length > 0) {
+    // Cache the new data
+    setCache(CACHE_KEY, data, CACHE_TTL);
+    cachedData = data;
+    hasCachedData = true;
+    
+    if (!isVisible) {
+      // Show content with a small delay for better perceived performance only if not already visible
+      setTimeout(() => {
+        isVisible = true;
+      }, 100);
+    }
+  } else if (!hasCachedData && !isVisible) {
+    // Only show placeholder if we don't have cached data and aren't visible yet
+    isVisible = true;
   }
+  
+  // Use cached data if available, otherwise use prop data
+  $: displayData = hasCachedData ? cachedData : data;
 </script>
 
 {#if isVisible}
   <div transition:fade={{ duration: 300 }}>
-    {#if data && data.cards.length > 0}
+    {#if displayData && displayData.cards.length > 0}
       <section class="dynamic-links">
         <div class="section-header" transition:fade={{ delay: 100, duration: 300 }}>
           <h2 class="section-title">Links</h2>
@@ -31,13 +64,13 @@
           <div
             class="grid grid-cols-[repeat(auto-fill,minmax(260px,1fr)_)] gap-x-6 gap-y-6 my-6"
           >
-            {#each data.cards as link}
+            {#each displayData.cards as link}
               <ArchiveCard type="link" url={link.url} title={link.text} value={link.emoji} />
             {/each}
           </div>
         </div>
       </section>
-    {:else if data !== undefined}
+    {:else if displayData !== undefined}
       <!-- Show placeholder only if data loading completed but empty -->
       <div class="mb-12 ml-4 text-center text-sm italic opacity-75">
         create a <code>blue.linkat.board</code> record at <a href="https://linkat.blue/" class="text-link hover:text-link-hover">https://linkat.blue/</a>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index ee672c1..8f51656 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -2,6 +2,7 @@
   import { onMount } from "svelte";
   import { getStores } from "$app/stores";
   import { createComponentDebugger } from "$lib/utils/debug.js";
+  import { getCache } from "$utils/cache";
   import type { Post, LinkBoard } from "$components/shared";
   
   const { page } = getStores();
@@ -24,6 +25,9 @@
   let isLoadingPosts = $state(false);
   let isLoadingLinks = $state(false);
 
+  // Check if we have cached data for links
+  let hasCachedLinks = $state(false);
+
   onMount(() => {
     debug.lifecycle('MainPage', 'mounted', {
       hasData: !!data,
@@ -32,6 +36,13 @@
       initialDynamicLinksCount: data?.dynamicLinks ? 'hasData' : 'noData'
     });
     
+    // Check for cached links data immediately
+    const cachedLinks = getCache<LinkBoard>('dynamic_links_data');
+    if (cachedLinks && cachedLinks.cards && cachedLinks.cards.length > 0) {
+      hasCachedLinks = true;
+      debug.debug('Found cached links data');
+    }
+    
     // Set a brief timeout to ensure the browser has time to determine locale
     setTimeout(() => {
       localeLoaded = true;
@@ -76,8 +87,8 @@
         }, 2500); // Wait 2.5 seconds before loading posts
       }
 
-      // Phase 3: Load dynamic links if not already loaded (with longer delay)
-      if (!dynamicLinksLoaded && data?.profile?.pds && data?.profile?.did) {
+      // Phase 3: Load dynamic links if not already loaded and no cached data
+      if (!dynamicLinksLoaded && !hasCachedLinks && data?.profile?.pds && data?.profile?.did) {
         setTimeout(async () => {
           try {
             isLoadingLinks = true;
@@ -100,8 +111,8 @@
             isLoadingLinks = false;
           }
         }, 5000); // Wait 5 seconds before loading links
-      } else if (!data?.profile?.pds || !data?.profile?.did) {
-        // If we don't have the necessary profile data, mark as loaded to prevent loading state
+      } else if (!data?.profile?.pds || !data?.profile?.did || hasCachedLinks) {
+        // If we don't have the necessary profile data or we have cached data, mark as loaded
         dynamicLinksLoaded = true;
       }
 
@@ -118,6 +129,7 @@
         dynamicLinksType: typeof dynamicLinksData,
         hasLatestPosts: !!latestPosts?.length,
         hasDynamicLinks: !!dynamicLinksData,
+        hasCachedLinks,
         blogPostsLoaded,
         dynamicLinksLoaded
       });
@@ -173,10 +185,11 @@
   </div>
 {/if}
 
-<!-- Dynamic Links section -->
-{#if dynamicLinksLoaded}
-  <DynamicLinks data={dynamicLinksData} />
-{:else if isLoadingLinks}
+<!-- Dynamic Links section - Always show component, let it handle caching internally -->
+<DynamicLinks data={dynamicLinksData} />
+
+<!-- Only show loading message if we don't have cached data and are actively loading -->
+{#if !hasCachedLinks && isLoadingLinks && !dynamicLinksLoaded}
   <div class="text-center py-4 animate-pulse">
     Loading links...
   </div>