diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 02fa72f..98cfdc6 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -24,7 +24,7 @@
 					</a>
 				</h2>
 				{{- .Scratch.Set "shortMeta" true -}}
-				{{- partial "post-meta.html" . }}
+				{{- partial "post-meta/post-meta.html" . }}
 				{{- if eq .Section "notes" }}
 				<div class="e-content entry-content" itemprop="articleBody">
 					{{- if .Params.replyURI -}}
diff --git a/layouts/about/list.html b/layouts/about/list.html
index 317936b..c1e437e 100644
--- a/layouts/about/list.html
+++ b/layouts/about/list.html
@@ -28,7 +28,7 @@
 				</p>
 				<div>
 				<p class="p-summary entry-summary" itemprop="description">{{ .Description }}</p>
-				<p>{{- partial "wordcount.html" . -}}</p>
+				<p>{{- partial "post-meta/wordcount.html" . -}}</p>
 				</div>
 			</article>
 		</li>
diff --git a/layouts/meta/list.html b/layouts/meta/list.html
index c696693..aa6b170 100644
--- a/layouts/meta/list.html
+++ b/layouts/meta/list.html
@@ -28,7 +28,7 @@
 				</p>
 				<div>
 				<p class="p-summary entry-summary" itemprop="description">{{ .Description }}</p>
-				<p>{{- partial "wordcount.html" . -}}</p>
+				<p>{{- partial "post-meta/wordcount.html" . -}}</p>
 				</div>
 			</article>
 		</li>
diff --git a/layouts/partials/full-article.html b/layouts/partials/full-article.html
index 324d384..8cce9ae 100644
--- a/layouts/partials/full-article.html
+++ b/layouts/partials/full-article.html
@@ -1,7 +1,7 @@
 <header>
 	<h1 itemprop="name headline" class="p-name entry-title" id="h1" tabindex="-1">{{ .Title }}</h1>
 	{{- if not .Params.disableMeta -}}
-	{{- partial "post-meta.html" . -}}
+	{{- partial "post-meta/post-meta.html" . -}}
 	{{- end -}}
 </header>
 <hr />
diff --git a/layouts/partials/interact.html b/layouts/partials/interact.html
index 563a138..5a2fbe5 100644
--- a/layouts/partials/interact.html
+++ b/layouts/partials/interact.html
@@ -3,5 +3,5 @@
 <h2 id="interact" tabindex="-1">Interact</h2>
 <p>You can interact by <a href="#webmentions">sending webmentions</a> or by visiting a syndicated copy of this post.</p>
 {{- partial "syndication.html" . -}}
-{{- partial "webmentions.html" . -}}
+{{- partial "webmentions/webmentions.html" . -}}
 </footer>
diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta/post-meta.html
similarity index 97%
rename from layouts/partials/post-meta.html
rename to layouts/partials/post-meta/post-meta.html
index 1ddc9d2..419e403 100644
--- a/layouts/partials/post-meta.html
+++ b/layouts/partials/post-meta/post-meta.html
@@ -34,7 +34,7 @@
 			{{- end -}}
 			{{- if not $isNotes -}}
 {{ if $needsList }}<li>{{ else }}<br />{{ end }}
-			{{ partial "wordcount.html" . -}}
+			{{ partial "post-meta/wordcount.html" . -}}
 {{ if $needsList }}</li>{{ end }}
 			{{- end -}}
 {{- if $needsList }}
diff --git a/layouts/partials/wordcount.html b/layouts/partials/post-meta/wordcount.html
similarity index 100%
rename from layouts/partials/wordcount.html
rename to layouts/partials/post-meta/wordcount.html
diff --git a/layouts/partials/posts.html b/layouts/partials/posts.html
index 0b92451..b8d713b 100644
--- a/layouts/partials/posts.html
+++ b/layouts/partials/posts.html
@@ -27,7 +27,7 @@
 
 				<div>
 				<p class="p-summary entry-summary" itemprop="description">{{ .Description }}</p>
-				<p>{{- partial "wordcount.html" . -}}</p>
+				<p>{{- partial "post-meta/wordcount.html" . -}}</p>
 				</div>
 			</article>
 		</li>
diff --git a/layouts/partials/webmentions/all-webmentions.html b/layouts/partials/webmentions/all-webmentions.html
new file mode 100644
index 0000000..680ff8d
--- /dev/null
+++ b/layouts/partials/webmentions/all-webmentions.html
@@ -0,0 +1 @@
+{{- return (index .Site.Data "webmentions").items -}}
diff --git a/layouts/partials/webmentions/rewrites.html b/layouts/partials/webmentions/rewrites.html
new file mode 100644
index 0000000..8b9911f
--- /dev/null
+++ b/layouts/partials/webmentions/rewrites.html
@@ -0,0 +1,5 @@
+{{- $rewritesDict := dict "" "" -}}
+{{- range $i, $r := (getCSV "," "/csv/rewrites.csv") -}}
+	{{- $rewritesDict = merge $rewritesDict (dict (index $r 0) (index $r 1)) -}}
+{{- end -}}
+{{- return $rewritesDict -}}
diff --git a/layouts/partials/webmentions/wbm-links.html b/layouts/partials/webmentions/wbm-links.html
new file mode 100644
index 0000000..2834f51
--- /dev/null
+++ b/layouts/partials/webmentions/wbm-links.html
@@ -0,0 +1 @@
+{{- return (slice "https://si3t.ch/log/2021-04-18-entetes-floc.html" "https://xmpp.org/2021/02/newsletter-02-feburary/" "https://gurlic.com/technology/post/393626430212145157" "https://gurlic.com/technology/post/343249858599059461" "https://www.librepunk.club/@penryn/108411423190214816" "https://benign.town/@josias/108457015755310198" "http://www.tuxmachines.org/node/148146" "https://i.reddit.com/r/web_design/comments/k0dmpj/an_opinionated_list_of_best_practices_for_textual/gdmxy4u/" "https://bbbhltz.space/posts/thoughts-on-tech-feb2021/" "https://jorts.horse/@alice/108477866954580532" "https://brid.gy/comment/mastodon/@Seirdy@pleroma.envs.net/AK7FeQ4h2tUCKNwlXc/AK7GtGkE7JOVgm1Cgi" "https://fosstodon.org/@werwolf/108529382741681838" "https://mastodon.social/@WahbAllat/108986614624476982" "https://linuxrocks.online/@friend/109029028283860044" "https://fosstodon.org/@fullstackthaumaturge/108765040526523487" "https://inhji.de/notes/an-opinionated-list-of-best-practices-for-textual-websites" "https://ravidwivedi.in/whatsapp/" "https://hackers.town/@theruran/108440680870400884" "https://hackers.town/@theruran/108440475936938471" "https://mckinley.cc/twtxt/2022-may-aug.html#2022-06-25T16:06:07-07:00" "https://tarnkappe.info/lesetipps-bayern-it-sicherheit-db-app-trackt-neue-eu-datenbank/" "https://catcatnya.com/@kescher/109221687024062842" "https://catcatnya.com/@kescher/109221707054861018" "https://catcatnya.com/@kescher/109221721385520640" "https://catcatnya.com/@kescher/109221750082044200" "https://brid.gy/post/twitter/seirdy/1536747178877673475" "https://markesler.com/blog/website-design/" "https://catcatnya.com/@kescher/108601418196537980" "https://chaos.social/@n0toose/109035270210401105" "https://nicfab.it/en/posts/aware-digital-communication-respecting-privacy-and-the-apps-or-services-you-choose/" "https://haxf4rall.com/2022/09/23/a-collection-of-articles-about-hardening-linux/" "https://mastodon.randomroad.social/@dctrud/108680634691924661" "https://brid.gy/post/twitter/seirdy/1535891978969174016" "https://mastodon.technology/@codeberg/108403449317373462" "https://harveyr.net/posts/14kb/" "https://brid.gy/comment/mastodon/@Seirdy@pleroma.envs.net/ANUjukccjwEmivz3ia/ANUmmjSDUviUeCz42S" "https://forum.fedeproxy.eu/t/keep-platform-open-article/161" "https://forum.forgefriends.org/t/keep-platform-open-article/161" "https://collapsitarian.io/notice/AP5QssaOBF4HLmDf8q") -}}
diff --git a/layouts/partials/webmention-form.html b/layouts/partials/webmentions/webmention-form.html
similarity index 100%
rename from layouts/partials/webmention-form.html
rename to layouts/partials/webmentions/webmention-form.html
diff --git a/layouts/partials/webmentions.html b/layouts/partials/webmentions/webmentions.html
similarity index 68%
rename from layouts/partials/webmentions.html
rename to layouts/partials/webmentions/webmentions.html
index 4a1ae6d..e857950 100644
--- a/layouts/partials/webmentions.html
+++ b/layouts/partials/webmentions/webmentions.html
@@ -1,13 +1,6 @@
-{{- $wbmLinks := (slice "https://si3t.ch/log/2021-04-18-entetes-floc.html" "https://xmpp.org/2021/02/newsletter-02-feburary/" "https://gurlic.com/technology/post/393626430212145157" "https://gurlic.com/technology/post/343249858599059461" "https://www.librepunk.club/@penryn/108411423190214816" "https://benign.town/@josias/108457015755310198" "http://www.tuxmachines.org/node/148146" "https://i.reddit.com/r/web_design/comments/k0dmpj/an_opinionated_list_of_best_practices_for_textual/gdmxy4u/" "https://bbbhltz.space/posts/thoughts-on-tech-feb2021/" "https://jorts.horse/@alice/108477866954580532" "https://brid.gy/comment/mastodon/@Seirdy@pleroma.envs.net/AK7FeQ4h2tUCKNwlXc/AK7GtGkE7JOVgm1Cgi" "https://fosstodon.org/@werwolf/108529382741681838" "https://mastodon.social/@WahbAllat/108986614624476982" "https://linuxrocks.online/@friend/109029028283860044" "https://fosstodon.org/@fullstackthaumaturge/108765040526523487" "https://inhji.de/notes/an-opinionated-list-of-best-practices-for-textual-websites" "https://ravidwivedi.in/whatsapp/" "https://hackers.town/@theruran/108440680870400884" "https://hackers.town/@theruran/108440475936938471" "https://mckinley.cc/twtxt/2022-may-aug.html#2022-06-25T16:06:07-07:00" "https://tarnkappe.info/lesetipps-bayern-it-sicherheit-db-app-trackt-neue-eu-datenbank/" "https://catcatnya.com/@kescher/109221687024062842" "https://catcatnya.com/@kescher/109221707054861018" "https://catcatnya.com/@kescher/109221721385520640" "https://catcatnya.com/@kescher/109221750082044200" "https://brid.gy/post/twitter/seirdy/1536747178877673475" "https://markesler.com/blog/website-design/" "https://catcatnya.com/@kescher/108601418196537980" "https://chaos.social/@n0toose/109035270210401105" "https://nicfab.it/en/posts/aware-digital-communication-respecting-privacy-and-the-apps-or-services-you-choose/" "https://haxf4rall.com/2022/09/23/a-collection-of-articles-about-hardening-linux/" "https://mastodon.randomroad.social/@dctrud/108680634691924661" "https://brid.gy/post/twitter/seirdy/1535891978969174016" "https://mastodon.technology/@codeberg/108403449317373462" "https://harveyr.net/posts/14kb/" "https://brid.gy/comment/mastodon/@Seirdy@pleroma.envs.net/ANUjukccjwEmivz3ia/ANUmmjSDUviUeCz42S" "https://forum.fedeproxy.eu/t/keep-platform-open-article/161" "https://forum.forgefriends.org/t/keep-platform-open-article/161" "https://collapsitarian.io/notice/AP5QssaOBF4HLmDf8q") -}}
-{{- $rewritesDict := dict "" "" -}}
-{{- range $i, $r := (getCSV "," "/csv/rewrites.csv") -}}
-	{{- $rewritesDict = merge $rewritesDict (dict (index $r 0) (index $r 1)) -}}
-{{- end -}}
 <h3 id="webmentions" tabindex="-1">Web&#173;mentions</h3>
 <p>This site supports <a href="https://indieweb.org/Webmention">Webmentions</a>, a backlink-based alternative to traditional comment forms.</p>
-<details><summary>Send a Webmention</summary>{{ partial "webmention-form.html" . }}</details>
-{{- /* Fetch all webmentions with bearer token */ -}}
-{{- $allMentions := (index .Site.Data "webmentions").items -}}
+<details><summary>Send a Webmention</summary>{{ partial "webmentions/webmention-form.html" . }}</details>
 {{- /* Filter webmentions to just the ones for the current targets */ -}}
 	{{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" -}}
 	{{- $target := printf "%s%s" .Site.Params.CanonicalBaseURL $canonicalRelPermalink -}}
@@ -19,7 +12,7 @@
 	{{- end -}}
 	{{- /* We can't just use a simple "where" function because we need to ignore URL anchors/query-params when making a comparison: https://discourse.gohugo.io/t/add-like-comparison-operator-to-the-where-function/42013/4 */ -}}
 	{{- $webmentions := slice -}}
-	{{- range $allMentions -}}
+	{{- range partialCached "webmentions/all-webmentions.html" . -}}
 		{{- if in $targets .target -}}
 			{{ $webmentions = $webmentions | append . }}
 		{{- else -}}
@@ -54,10 +47,10 @@
 				{{- $title = $webmention.title | strings.TrimSuffix "…" | truncate 128 -}}
 			{{- end -}}
 			{{- $src := $webmention.source -}}
-			{{- with index $rewritesDict $src -}}
+			{{- with index (partialCached "webmentions/rewrites.html" .) $src -}}
 				{{- $src = . -}}
 			{{- end -}}
-			{{- if in $wbmLinks $src -}}
+			{{- if in (partialCached "webmentions/wbm-links.html" .) $src -}}
 				{{- $src = printf "https://web.archive.org/web/0/%s" $src -}}
 			{{- end -}}
 			{{ if (eq $webmention.type "like") -}}