diff --git a/Gemfile b/Gemfile
index 9fa14ecfd..b8e8a25e6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,4 +2,6 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
-gem "jekyll", "~> 4.1.1"
+gem "jekyll", "~> 4.2"
+
+gem "jekyll-include-cache", "~> 0.2.1"
diff --git a/_config.yml b/_config.yml
index 61bf6bdec..7bfbbce9e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,6 +3,9 @@ source: src
 host: 0.0.0.0
 port: 4001
 
+plugins:
+  - jekyll-include-cache
+
 exclude:
   - .idea
   - package.json
diff --git a/src/_icons/mushroom.svg b/src/_icons/mushroom.svg
index 9fb98b2bd..1ce14795e 100644
--- a/src/_icons/mushroom.svg
+++ b/src/_icons/mushroom.svg
@@ -1,4 +1,5 @@
 ---
+category: Food
 ---
 <svg>
   <path d="M20 11.1c0 -4.474 -3.582 -8.1 -8 -8.1s-8 3.626 -8 8.1a0.9 .9 0 0 0 .9 .9h14.2a0.9 .9 0 0 0 .9 -.9z" />
diff --git a/src/_icons/pizza.svg b/src/_icons/pizza.svg
index 388142e4b..bfb41fee2 100644
--- a/src/_icons/pizza.svg
+++ b/src/_icons/pizza.svg
@@ -3,7 +3,7 @@ version: 1.35
 ---
 <svg>
   <path d="M12 21.5c-3.04 0 -5.952 -.714 -8.5 -1.983l8.5 -16.517l8.5 16.517a19.09 19.09 0 0 1 -8.5 1.983z" />
-  <path d="M5.2 15.772a14.939 14.939 0 0 0 6.995 1.728a14.944 14.944 0 0 0 6.638 -1.545" />
-  <line x1="13" y1="11.01" x2="13" y2="11" />
-  <line x1="11" y1="14" x2="11" y2="13.99" />
+  <path d="M5.38 15.866a14.94 14.94 0 0 0 6.815 1.634a14.944 14.944 0 0 0 6.502 -1.479" />
+  <path d="M13 11.01v-.01" />
+  <path d="M11 14v-.01" />
 </svg>
diff --git a/src/_includes/toolbar.html b/src/_includes/toolbar.html
index afca90051..e3f5283d2 100644
--- a/src/_includes/toolbar.html
+++ b/src/_includes/toolbar.html
@@ -5,7 +5,7 @@
 	{% assign buttons = group | split: ',' %}
 	<div class="buttons">
 		{% for button in buttons %}
-		<div class="button js-icon" data-icon="{{ button }}">{% include icon.html name=button %}</div>
+		<div class="button js-icon" data-icon="{{ button }}">{% include_cached icon.html name=button %}</div>
 		{% endfor %}
 	</div>
 	{% endfor %}
diff --git a/src/_layouts/icon.html b/src/_layouts/icon.html
index 532da97cc..4ef8c28db 100644
--- a/src/_layouts/icon.html
+++ b/src/_layouts/icon.html
@@ -1,3 +1,3 @@
 ---
 ---
-{% include icon.html name=page.slug %}
+{% include_cached icon.html name=page.slug %}
diff --git a/src/editor.html b/src/editor.html
index e1cca14cc..f573cc88e 100644
--- a/src/editor.html
+++ b/src/editor.html
@@ -10,7 +10,7 @@ layout: default
 		{% assign first-icon = site.icons | reverse | first %}
 		{% assign slug = first-icon.slug %}
 		{% capture first-icon %}
-		{% include icon.html name=slug %}
+		{% include_cached icon.html name=slug %}
 		{% endcapture %}
 
 		<div class="row mb js-icon-manager">
@@ -76,7 +76,7 @@ layout: default
 
 		<div class="mb">
 			{% include toolbar.html
-			toolbar='arrow-back-up,arrow-forward-up,printer,paint|bold,italic,underline,strikethrough,emphasis|align-left,align-center,align-right,align-justified,line-height|list,list-check|h-1,h-2,h-3,h-4,h-5,h-6,link,photo,table|sort-ascending,sort-descending,sort-ascending-letters,sort-ascending-numbers|indent-increase,indent-decrease|subscript,superscript|minus,omega,chart-area-line,pencil|eraser,settings,typography,letters-case,clear-formatting|parentheses,brackets,braces,terminal|bike,run,swimming,walk,pray,fall,karate|repeat,repeat-once,switch,player-record,player-play,player-pause,player-stop,power,player-skip-forward,player-skip-back,player-track-next,player-track-prev'
+			toolbar='arrow-back-up,arrow-forward-up,printer,paint|bold,italic,underline,strikethrough,emphasis|align-left,align-center,align-right,align-justified,line-height|list,list-check,list-numbers|h-1,h-2,h-3,h-4,h-5,h-6,link,photo,table|sort-ascending,sort-descending,sort-ascending-letters,sort-ascending-numbers|indent-increase,indent-decrease|subscript,superscript|minus,omega,chart-area-line,pencil|eraser,settings,typography,letters-case,clear-formatting|parentheses,brackets,braces,terminal|bike,run,swimming,walk,pray,fall,karate|repeat,repeat-once,switch,player-record,player-play,player-pause,player-stop,power,player-skip-forward,player-skip-back,player-track-next,player-track-prev'
 			%}
 		</div>
 
@@ -91,7 +91,7 @@ layout: default
 				{% for icon in new-icons %}
 				{% assign name = icon.slug %}
 				<a href="#" class="icons-list-icon js-icon" title="{{ icon.slug }}" data-icon="{{ name }}"{% unless icon.category %} style="color: #999" {% endunless %}>
-					{% include icon.html name=name %}
+					{% include_cached icon.html name=name %}
 				</a>
 				{% endfor %}
 			</div>
@@ -115,7 +115,7 @@ layout: default
 				{% for icon in category.items %}
 				{% assign name = icon.slug %}
 				<a href="#" class="icons-list-icon js-icon{% unless icon.version %} new-icon{% endunless %}" title="{{ icon.slug }}" data-icon="{{ name }}">
-					{% include icon.html name=name %}
+					{% include_cached icon.html name=name %}
 				</a>
 				{% endfor %}
 			</div>
diff --git a/src/index.html b/src/index.html
index f8fc5f9fc..5e409a7a3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -8,7 +8,7 @@ layout: default
 				{% for icon in site.icons %}
 				{% assign name = icon.slug %}
 				<div class="icons-list-icon js-icon" title="{{ icon.slug }}" data-icon="{{ name }}">
-					{% include icon.html name=name %}
+					{% include_cached icon.html name=name %}
 				</div>
 				{% endfor %}
 			</div>
@@ -20,7 +20,7 @@ layout: default
 				{% for icon in site.icons %}
 				{% assign name = icon.slug %}
 				<div class="icons-list-icon js-icon" title="{{ icon.slug }}" data-icon="{{ name }}">
-					{% include icon.html name=name stroke=1.25 %}
+					{% include_cached icon.html name=name stroke=1.25 %}
 				</div>
 				{% endfor %}
 			</div>
diff --git a/src/tags.html b/src/tags.html
index 8148f92ed..fbd5b54df 100644
--- a/src/tags.html
+++ b/src/tags.html
@@ -8,7 +8,7 @@ layout: default
 		<table class="table mb">
 			{% for icon in site.icons %}
 			<tr>
-				<td class="td-1">{% include icon.html name=icon.slug %}</td>
+				<td class="td-1">{% include_cached icon.html name=icon.slug %}</td>
 				<th>{{ icon.slug }}</th>
 				<td>{{ icon.tags | join: ', ' }}</td>
 				<td>{{ icon.category }}</td>