diff --git a/manifests/master/routes.pp b/manifests/master/routes.pp
index a5f01ee..fcdda80 100644
--- a/manifests/master/routes.pp
+++ b/manifests/master/routes.pp
@@ -1,44 +1,51 @@
 # Manages the routes configuration file on the master. See README.md for more
 # details.
 class puppetdb::master::routes (
   $puppet_confdir = $puppetdb::params::puppet_confdir,
   $masterless     = $puppetdb::params::masterless,
-  $routes         = {
-    'master' => {
-      'facts' => {
-        'terminus' => 'puppetdb',
-        'cache'    => 'yaml',
-      }
-    }
-  }
+  $routes         = undef,
 ) inherits puppetdb::params {
 
   if $masterless {
     $routes_real = {
       'apply' => {
         'catalog' => {
           'terminus' => 'compiler',
           'cache'    => 'puppetdb',
         },
         'facts'   => {
           'terminus' => 'facter',
           'cache'    => 'puppetdb_apply',
         }
       }
     }
-  } else {
+  } elsif $routes {
     $routes_real = $routes
+  } else {
+    if (defined('$serverversion')) and (versioncmp($serverversion, '7.0') >= 0) {
+      $default_fact_cache = 'json'
+    } else {
+      $default_fact_cache = 'yaml'
+    }
+    $routes_real = {
+      'master' => {
+        'facts' => {
+          'terminus' => 'puppetdb',
+          'cache'    => $default_fact_cache,
+        }
+      }
+    }
   }
 
   # TODO: this will overwrite any existing routes.yaml;
   #  to handle this properly we should just be ensuring
   #  that the proper settings exist, but to do that we'd need
   #  to parse the yaml file and rewrite it, dealing with indentation issues etc
   #  I don't think there is currently a puppet module or an augeas lens for
   #  this.
   file { "${puppet_confdir}/routes.yaml":
     ensure  => file,
     content => template('puppetdb/routes.yaml.erb'),
     mode    => '0644',
   }
 }
diff --git a/spec/unit/classes/master/config_spec.rb b/spec/unit/classes/master/config_spec.rb
index 1390a9e..896cccf 100644
--- a/spec/unit/classes/master/config_spec.rb
+++ b/spec/unit/classes/master/config_spec.rb
@@ -1,150 +1,162 @@
 require 'spec_helper'
 
 describe 'puppetdb::master::config', type: :class do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
         facts.merge(puppetversion: Puppet.version,
                     fqdn: 'puppetdb.example.com',
                     selinux: true)
       end
 
       context 'when PuppetDB on remote server' do
         context 'when using default values' do
           it { is_expected.to compile.with_all_deps }
         end
       end
 
       context 'when PuppetDB and Puppet Master are on the same server' do
         context 'when using default values' do
           let(:pre_condition) { 'class { "puppetdb": }' }
 
           it {
             is_expected.to contain_puppetdb_conn_validator('puppetdb_conn').with(
               puppetdb_server: 'puppetdb.example.com',
               puppetdb_port: '8081',
               use_ssl: 'true',
             )
           }
         end
 
         context 'when puppetdb class is declared with disable_ssl => true' do
           let(:pre_condition) { 'class { "puppetdb": disable_ssl => true }' }
 
           it {
             is_expected.to contain_puppetdb_conn_validator('puppetdb_conn').with(
               puppetdb_port: '8080',
               use_ssl: 'false',
             )
           }
         end
 
         context 'when puppetdb_port => 1234' do
           let(:pre_condition) { 'class { "puppetdb": }' }
           let(:params) { { puppetdb_port: '1234' } }
 
           it {
             is_expected.to contain_puppetdb_conn_validator('puppetdb_conn').with(
               puppetdb_port: '1234',
               use_ssl: 'true',
             )
           }
         end
 
         context 'when puppetdb_port => 1234 AND the puppetdb class is declared with disable_ssl => true' do
           let(:pre_condition) { 'class { "puppetdb": disable_ssl => true }' }
           let(:params) { { puppetdb_port: '1234' } }
 
           it {
             is_expected.to contain_puppetdb_conn_validator('puppetdb_conn').with(
               puppetdb_port: '1234',
               use_ssl: 'false',
             )
           }
         end
 
         context 'when using default values' do
           it { is_expected.to contain_package('puppetdb-termini').with(ensure: 'present') }
           it { is_expected.to contain_puppetdb_conn_validator('puppetdb_conn').with(test_url: '/pdb/meta/v1/version') }
         end
 
         context 'when using an older puppetdb version' do
           let(:pre_condition) { 'class { "puppetdb::globals": version => "2.2.0", }' }
 
           it { is_expected.to contain_package('puppetdb-terminus').with(ensure: '2.2.0') }
           it { is_expected.to contain_puppetdb_conn_validator('puppetdb_conn').with(test_url: '/v3/version') }
         end
       end
     end
   end
   context 'when upgrading to from v2 to v3 of PuppetDB on RedHat' do
     let(:facts) do
       {
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
         puppetversion: Puppet.version,
         operatingsystemrelease: '7.0',
         kernel: 'Linux',
         selinux: true,
+        os: {
+          family: 'RedHat',
+          name: 'RedHat',
+          release: { 'full' => '7.0' },
+          selinux: { 'enabled' => true },
+        },
       }
     end
     let(:pre_condition) { 'class { "puppetdb::globals": version => "3.1.1-1.el7", }' }
 
     it { is_expected.to contain_exec('Remove puppetdb-terminus metadata for upgrade').with(command: 'rpm -e --justdb puppetdb-terminus') }
   end
 
   context 'when restart_puppet is true' do
     let(:facts) do
       {
         osfamily: 'RedHat',
         operatingsystem: 'RedHat',
         puppetversion: Puppet.version,
         operatingsystemrelease: '7.0',
         kernel: 'Linux',
         selinux: true,
+        os: {
+          family: 'RedHat',
+          name: 'RedHat',
+          release: { 'full' => '7.0' },
+          selinux: { 'enabled' => true },
+        },
       }
     end
 
     let(:pre_condition) { 'class { "puppetdb": }' }
 
     context 'with create_puppet_service_resource as default' do
       let(:params) do
         {
           puppet_service_name: 'puppetserver',
           restart_puppet: true,
         }
       end
 
       it { is_expected.to contain_service('puppetserver').with(ensure: 'running') }
     end
 
     context 'with create_puppet_service_resource = true' do
       let(:params) do
         {
           create_puppet_service_resource: true,
           puppet_service_name: 'puppetserver',
           restart_puppet: true,
         }
       end
 
       it { is_expected.to contain_service('puppetserver').with(ensure: 'running') }
     end
 
     context 'with create_puppet_service_resource = false' do
       # Also setting the various parameters that notify the service to be false. Otherwise this error surfaces:
       # `Could not find resource 'Service[puppetserver]' for relationship from 'Class[Puppetdb::Master::Puppetdb_conf]'`
       let(:params) do
         {
           create_puppet_service_resource: false,
           manage_config: false,
           manage_report_processor: false,
           manage_routes: false,
           puppet_service_name: 'puppetserver',
           restart_puppet: true,
         }
       end
 
       it { is_expected.not_to contain_service('puppetserver') }
     end
   end
 end