diff --git a/layouts/404.html b/layouts/404.html
index 6a8371c5cc..050950a38d 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -11,7 +11,7 @@
     {{- end }}
     <title>{{ .Scratch.Get "title" }} {{ default "::" .Site.Params.titleSeparator }} {{ .Site.Title }}</title>
 
-    {{- partial "favicon.html" . }}
+    {{- partialCached "favicon.html" . }}
     {{- partial "stylesheet.html" . }}
     <style>
       p, li, ul {
diff --git a/layouts/partials/archetype.hugo b/layouts/partials/archetype.hugo
index 805e1c3cde..c4ac29402e 100644
--- a/layouts/partials/archetype.hugo
+++ b/layouts/partials/archetype.hugo
@@ -9,7 +9,8 @@
 {{- else if $page.IsHome }}
   {{- $archetype = "deprecated-home" }}
 {{- end }}
-{{- if not (fileExists (printf "/layouts/partials/archetypes/%s" $archetype)) }}
+{{- $f := printf "/layouts/partials/archetypes/%s" $archetype }}
+{{- if not (partialCached "fileExists.hugo" $f $f) }}
   {{- $archetype = "default" }}
 {{- end }}
 {{- partial "output-partial.hugo" (dict "base" (printf "archetypes/%s/%s" $archetype $hook) "page" $page "parameter" $parameter) }}
\ No newline at end of file
diff --git a/layouts/partials/fileExists.hugo b/layouts/partials/fileExists.hugo
new file mode 100644
index 0000000000..c91cfbe29c
--- /dev/null
+++ b/layouts/partials/fileExists.hugo
@@ -0,0 +1 @@
+{{- return fileExists . }}
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index b1379717b2..4f84205d36 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -29,7 +29,7 @@
         {{- end }}
     {{- end }}
 
-    {{- partial "favicon.html" . }}
+    {{- partialCached "favicon.html" . }}
     {{- partial "stylesheet.html" . }}
     {{- partial "custom-header.html" . }}
   </head>
diff --git a/layouts/partials/output-partial.hugo b/layouts/partials/output-partial.hugo
index 3e77a4a6d8..9e5f687683 100644
--- a/layouts/partials/output-partial.hugo
+++ b/layouts/partials/output-partial.hugo
@@ -3,8 +3,10 @@
 {{- $parameter := .parameter }}
 {{- $format := partial "output-format.hugo" $page }}
 {{- $suffix := partial "output-suffix.hugo" $page }}
-{{- if or (not $format) (not (fileExists (printf "/layouts/partials/%s.%s.%s" $base $format $suffix))) }}
-  {{- if (fileExists (printf "/layouts/partials/%s.%s" $base $suffix)) }}
+{{- $f := printf "/layouts/partials/%s.%s.%s" $base $format $suffix }}
+{{- if or (not $format) (not (partialCached "fileExists.hugo" $f $f)) }}
+  {{- $f = printf "/layouts/partials/%s.%s" $base $suffix }}
+  {{- if partialCached "fileExists.hugo" $f $f }}
     {{- partial (printf "%s.%s" $base $suffix) $parameter }}
   {{- end }}
 {{- else }}
diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 43f34b66fe..53c2673d8c 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -10,8 +10,8 @@
         {{- $quotedcontentlangs := slice }}
         {{- $missingcontentlangs := slice }}
         {{- range $contentlangs }}
-          {{- $file := (printf "js/lunr.%s.min.js" .) }}
-          {{- if fileExists (printf "/static/%s" $file) }}
+          {{- $f := printf "/static/js/lunr.%s.min.js" . }}
+          {{- if partialCached "fileExists.hugo" $f $f }}
             {{- $quotedcontentlangs = $quotedcontentlangs | append (printf "'%s'" .) }}
           {{- else }}
             {{- $missingcontentlangs = $missingcontentlangs | append . }}
diff --git a/layouts/partials/stylesheet.html b/layouts/partials/stylesheet.html
index 26cc226804..a2847716f3 100644
--- a/layouts/partials/stylesheet.html
+++ b/layouts/partials/stylesheet.html
@@ -14,7 +14,8 @@
     <link href="{{"css/ie.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     <link href="{{"css/variant.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     <link href="{{"css/print.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet" media="print">
-    {{- if (fileExists (printf "/static/css/format-%s.css" (partial "output-format.hugo" .))) }}
+    {{- $f := printf "/static/css/format-%s.css" (partial "output-format.hugo" .) }}
+    {{- if partialCached "fileExists.hugo" $f $f }}
     <link href="{{(printf "css/format-%s.css" (partial "output-format.hugo" .)) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     {{- end }}
     <script src="{{"js/variant.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>