diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 16aecc7ad..d3c77bd5e 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -80,6 +80,11 @@
 #
 {{ get_config('cachedir', '/var/cache/salt/master') }}
 
+# Specify the returner to use for the job cache.  The job cache will only be
+# interacted with from the salt master and therefore does not need to be
+# accessible from the minions.
+{{ get_config('master_job_cache', 'local_cache') }}
+
 # Directory for custom modules. This directory can contain subdirectories for
 # each of Salt's module types such as "runners", "output", "wheel", "modules",
 # "states", "returners", etc.
@@ -1223,7 +1228,7 @@ ext_pillar:
         {%- endif %}
       {%- endfor -%}
     {%- elif pillar[key] is mapping and pillar[key] is not string %}
-  - {{ key }}: 
+  - {{ key }}:
       {%- for parameter in pillar[key] %}
       {{ parameter }}: {{pillar[key][parameter]}}
       {%- endfor %}