diff --git a/_includes/head.html b/_includes/head.html
index 577c67b..e4bfcb6 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -45,7 +45,7 @@
     {{ site.title }}
   </title>
 
-  {% include favicons.html %}
+  {% include_cached favicons.html %}
 
   {% if site.resources.ignore_env != jekyll.environment and site.resources.self_hosted %}
     <link href="{{ site.data.origin[type].webfonts | relative_url }}" rel="stylesheet">
diff --git a/_includes/search-results.html b/_includes/search-results.html
index e4ffb48..07981ff 100644
--- a/_includes/search-results.html
+++ b/_includes/search-results.html
@@ -3,7 +3,7 @@
 <div id="search-result-wrapper" class="d-flex justify-content-center unloaded">
   <div class="col-11 post-content">
     <div id="search-hints">
-      {% include trending-tags.html %}
+      {% include_cached trending-tags.html %}
     </div>
     <div id="search-results" class="d-flex flex-wrap justify-content-center text-muted mt-3"></div>
   </div>
diff --git a/_layouts/default.html b/_layouts/default.html
index 634701c..0047570 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -26,11 +26,11 @@ layout: compress
       <div id="main" class="container px-xxl-5">
         {% include topbar.html lang=lang %}
         {{ content }}
-        {% include search-results.html lang=lang %}
+        {% include_cached search-results.html lang=lang %}
       </div>
     </div>
 
-    {% include footer.html lang=lang %}
+    {% include_cached footer.html lang=lang %}
 
     <div id="mask"></div>
 
@@ -71,6 +71,6 @@ layout: compress
       {% include mermaid.html %}
     {% endif %}
 
-    {% include search-loader.html %}
+    {% include_cached search-loader.html %}
   </body>
 </html>
diff --git a/_layouts/page.html b/_layouts/page.html
index fc2c915..9899308 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -40,8 +40,8 @@ layout: default
   <!-- panel -->
   <div id="panel-wrapper" class="col-xl-3 ps-2 text-muted">
     <div class="access">
-      {% include update-list.html lang=lang %}
-      {% include trending-tags.html lang=lang %}
+      {% include_cached update-list.html lang=lang %}
+      {% include_cached trending-tags.html lang=lang %}
     </div>
 
     {% for _include in layout.panel_includes %}
diff --git a/_layouts/tags.html b/_layouts/tags.html
index 7800ca0..cf8cc76 100644
--- a/_layouts/tags.html
+++ b/_layouts/tags.html
@@ -3,7 +3,7 @@ layout: page
 # All the Tags of posts.
 ---
 
-<div id="tags" class="d-flex flex-wrap mx-xl-2">
+<div id="tags" class="d-flex flex-wrap mx-xl-2 mb-5">
   {% assign tags = '' | split: '' %}
   {% for t in site.tags %}
     {% assign tags = tags | push: t[0] %}
diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec
index a426d61..3e41f2d 100644
--- a/jekyll-theme-chirpy.gemspec
+++ b/jekyll-theme-chirpy.gemspec
@@ -31,5 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.7"
   spec.add_runtime_dependency "jekyll-archives", "~> 2.2"
   spec.add_runtime_dependency "jekyll-sitemap", "~> 1.4"
+  spec.add_runtime_dependency "jekyll-include-cache", "~> 0.2"
 
 end