diff --git a/layouts/partials/components/sidebar/footer.html b/layouts/partials/components/sidebar/bottom.html
similarity index 100%
rename from layouts/partials/components/sidebar/footer.html
rename to layouts/partials/components/sidebar/bottom.html
diff --git a/layouts/partials/sidebar-ng.html b/layouts/partials/sidebar-ng.html
index 7fb3a71..8e7a6bf 100644
--- a/layouts/partials/sidebar-ng.html
+++ b/layouts/partials/sidebar-ng.html
@@ -8,9 +8,18 @@
 {{- $navRoot := cond (eq site.Home.Type "docs") site.Home $context.FirstSection -}}
 {{- $pageURL := $context.RelPermalink -}}
 
-{{/* {{ $data := partialCached "components/sidebar/get-section-data" $context $context.Section }} */}}
-{{- $data := partial "components/sidebar/generate-section-data" $navRoot | unmarshal -}}
-{{- $dataMobile := partial "components/sidebar/generate-section-data" site.Home | unmarshal -}}
+{{- $data := slice -}}
+{{- $dataMobile := slice -}}
+
+{{- if (eq site.Params.page.sidebar.source "data") -}}
+  {{ $data = partialCached "components/sidebar/get-section-data" $context $context.Section }}
+  {{- $dataMobile = $data -}}
+{{- else -}}
+  {{- $data = (partialCached "components/sidebar/generate-section-data" $navRoot $navRoot) | unmarshal -}}
+  {{- $dataMobile = (partialCached "components/sidebar/generate-section-data" site.Home site.Home) | unmarshal -}}
+{{- end -}}
+
+{{- $shouldCache := site.Params.page.sidebar.cache | default false -}}
 
 
 <div class="mobile-menu-overlay [transition:background-color_1.5s_ease] hx-fixed hx-inset-0 hx-z-10 hx-bg-black/80 dark:hx-bg-black/60 hx-hidden"></div>
@@ -35,9 +44,13 @@
     {{- else -}}
       <ul class="hx-flex hx-flex-col hx-gap-1 max-md:hx-hidden">
         {{- with $data -}}
-          {{- partial "components/sidebar/render-data" (dict "data" . "page" $context) -}}
+          {{- if $shouldCache -}}
+            {{- partialCached "components/sidebar/render-data" (dict "data" . "page" $context) $navRoot -}}
+          {{- else -}}
+            {{- partial "components/sidebar/render-data" (dict "data" . "page" $context) -}}
+          {{- end -}}
         {{- end -}}
-        {{- partialCached "components/sidebar/footer" $context site.Home -}}
+        {{- partialCached "components/sidebar/bottom" $context site.Home -}}
       </ul>
     {{ end -}}
   </div>
@@ -59,7 +72,9 @@
 
   {{ if or site.IsMultiLingual $displayThemeToggle }}
     <div
-      class="{{ $switchesClass }} {{ with site.IsMultiLingual }}hx-justify-end{{ end }} hx-sticky hx-bottom-0 hx-bg-white dark:hx-bg-dark hx-mx-4 hx-py-4 hx-shadow-[0_-12px_16px_#fff] hx-flex hx-items-center hx-gap-2 dark:hx-border-neutral-800 dark:hx-shadow-[0_-12px_16px_#111] contrast-more:hx-border-neutral-400 contrast-more:hx-shadow-none contrast-more:dark:hx-shadow-none hx-border-t"
+      class="{{ $switchesClass }} {{ with site.IsMultiLingual }}
+        hx-justify-end
+      {{ end }} hx-sticky hx-bottom-0 hx-bg-white dark:hx-bg-dark hx-mx-4 hx-py-4 hx-shadow-[0_-12px_16px_#fff] hx-flex hx-items-center hx-gap-2 dark:hx-border-neutral-800 dark:hx-shadow-[0_-12px_16px_#111] contrast-more:hx-border-neutral-400 contrast-more:hx-shadow-none contrast-more:dark:hx-shadow-none hx-border-t"
       data-toggle-animation="show"
     >
       {{- with site.IsMultiLingual -}}