diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index edf53fb..4ae562e 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -8,5 +8,5 @@
 
     {{ partialCached "footer/footer" . }}
 
-    {{ partial "article/components/photoswipe" . }}
+    {{ partialCached "article/components/photoswipe" . }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index 0d0a35f..91021c4 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -9,7 +9,7 @@
             {{ end }}
         </div>
 
-        {{ $image := partial "helper/image" (dict "Context" . "Type" "taxonomy") }}
+        {{ $image := partialCached "helper/image" (dict "Context" . "Type" "taxonomy") .RelPermalink }}
         {{ if $image.exists }}
             <div class="taxonomy-image">
                 {{ if $image.resource }}   
diff --git a/layouts/partials/article-list/compact.html b/layouts/partials/article-list/compact.html
index 1a71318..344086e 100644
--- a/layouts/partials/article-list/compact.html
+++ b/layouts/partials/article-list/compact.html
@@ -12,7 +12,7 @@
         </footer>
     </div>
 
-    {{ $image := partial "helper/image" (dict "Context" . "Type" "articleList") }}
+    {{ $image := partialCached "helper/image" (dict "Context" . "Type" "articleList") .RelPermalink }}
     
     {{ if $image.exists }}
         <div class="article-image">
diff --git a/layouts/partials/article-list/default.html b/layouts/partials/article-list/default.html
index ccbfba5..29e9daa 100644
--- a/layouts/partials/article-list/default.html
+++ b/layouts/partials/article-list/default.html
@@ -1,4 +1,4 @@
-{{ $image := partial "helper/image" (dict "Context" . "Type" "articleList") }}
+{{ $image := partialCached "helper/image" (dict "Context" . "Type" "articleList") .RelPermalink }}
 <article class="{{ if $image.exists }}has-image{{ end }}">
     {{ if $image.exists }}
         <div class="article-image">
diff --git a/layouts/partials/article-list/tile.html b/layouts/partials/article-list/tile.html
index ea38a83..b846681 100644
--- a/layouts/partials/article-list/tile.html
+++ b/layouts/partials/article-list/tile.html
@@ -1,4 +1,4 @@
-{{ $image := partial "helper/image" (dict "Context" .context "Type" .Type) }}
+{{ $image := partialCached "helper/image" (dict "Context" .context "Type" .Type) .context.RelPermalink }}
 <article class="{{ if $image.exists }}has-image{{ end }}">
     <a href="{{ .context.Permalink }}">
         
diff --git a/layouts/partials/article/components/details.html b/layouts/partials/article/components/details.html
index 1b776be..89d5554 100644
--- a/layouts/partials/article/components/details.html
+++ b/layouts/partials/article/components/details.html
@@ -1,4 +1,4 @@
-{{ $image := partial "helper/image" (dict "Context" .) }}
+{{ $image := partialCached "helper/image" (dict "Context" .) .RelPermalink }}
 {{ $context := . }}
 <div class="article-details">
     {{ with $categories := .Params.categories }}
diff --git a/layouts/partials/article/components/header.html b/layouts/partials/article/components/header.html
index df7c764..1d2c7dc 100644
--- a/layouts/partials/article/components/header.html
+++ b/layouts/partials/article/components/header.html
@@ -1,5 +1,5 @@
 <header class="article-header">
-    {{ $image := partial "helper/image" (dict "Context" . "Type" "article") }}
+    {{ $image := partialCached "helper/image" (dict "Context" . "Type" "article") .RelPermalink }}
 
     {{ if $image.exists }}
         <div class="article-image">
diff --git a/layouts/partials/head/head.html b/layouts/partials/head/head.html
index 5ab35dd..9df2ea1 100644
--- a/layouts/partials/head/head.html
+++ b/layouts/partials/head/head.html
@@ -2,10 +2,10 @@
     <meta charset='utf-8'>
     <meta name='viewport' content='width=device-width, initial-scale=1'>
     
-    {{- $description := partial "data/description" . -}}
+    {{- $description := partialCached "data/description" . .RelPermalink -}}
     <meta name='description' content='{{ $description }}'>
 
-    {{- $title := partial "data/title" . -}}
+    {{- $title := partialCached "data/title" . .RelPermalink -}}
     <title>{{ $title }}</title>
     
     <link rel='canonical' href='{{ .Permalink }}'>
diff --git a/layouts/partials/head/opengraph/provider/base.html b/layouts/partials/head/opengraph/provider/base.html
index ea7f084..10dddb9 100644
--- a/layouts/partials/head/opengraph/provider/base.html
+++ b/layouts/partials/head/opengraph/provider/base.html
@@ -1,5 +1,5 @@
-{{- $title := partial "data/title" . -}}
-{{- $description := partial "data/description" . -}}
+{{- $title := partialCached "data/title" . .RelPermalink -}}
+{{- $description := partialCached "data/description" . .RelPermalink -}}
 
 <meta property='og:title' content='{{ $title }}'>
 <meta property='og:description' content='{{ $description }}'>
@@ -37,7 +37,7 @@
 	{{- end -}}
 {{- end -}}
 
-{{ $image := partial "helper/image" (dict "Context" . "Type" "opengraph") }}
+{{ $image := partialCached "helper/image" (dict "Context" . "Type" "opengraph") .RelPermalink }}
 {{- if $image.exists -}}
     <meta property='og:image' content='{{ absURL $image.permalink }}' />
 {{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/head/opengraph/provider/twitter.html b/layouts/partials/head/opengraph/provider/twitter.html
index 707ae2b..a33757b 100644
--- a/layouts/partials/head/opengraph/provider/twitter.html
+++ b/layouts/partials/head/opengraph/provider/twitter.html
@@ -2,13 +2,13 @@
     <meta name="twitter:site" content="{{ . }}">
 {{- end -}}
 
-{{- $title := partial "data/title" . -}}
-{{- $description := partial "data/description" . -}}
+{{- $title := partialCached "data/title" . .RelPermalink -}}
+{{- $description := partialCached "data/description" . .RelPermalink -}}
 
 <meta name="twitter:title" content="{{ $title }}">
 <meta name="twitter:description" content="{{ $description }}">
 
-{{- $image := partial "helper/image" (dict "Context" . "Type" "opengraph") -}}
+{{- $image := partialCached "helper/image" (dict "Context" . "Type" "opengraph") .RelPermalink -}}
 {{- if $image.exists -}}
 	<meta name="twitter:card" content="{{ .Site.Params.opengraph.twitter.card }}">
 	<meta name="twitter:image" content='{{ absURL $image.permalink }}' />
diff --git a/layouts/post/single.html b/layouts/post/single.html
index aabeee7..8cd32de 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -17,5 +17,5 @@
 
     {{ partialCached "footer/footer" . }}
 
-    {{- partial "article/components/photoswipe.html" . -}}
+    {{- partialCached "article/components/photoswipe.html" . -}}
 {{ end }}
\ No newline at end of file