diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 00b19baf6..69464f3ba 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -227,6 +227,10 @@ class tripleo::profile::base::keystone (
     $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
     $memcached_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
 
+    class { 'keystone::cache':
+      memcache_servers => $memcached_servers,
+    }
+
     class { 'keystone':
       sync_db                    => $sync_db,
       default_transport_url      => os_transport_url({
@@ -248,7 +252,6 @@ class tripleo::profile::base::keystone (
       notification_topics        => union($ceilometer_notification_topics,
                                           $barbican_notification_topics,
                                           $extra_notification_topics),
-      cache_memcache_servers     => $memcached_servers
     }
 
     if 'amqp' in [$oslomsg_rpc_proto, $oslomsg_notify_proto]{
diff --git a/spec/classes/tripleo_profile_base_keystone_spec.rb b/spec/classes/tripleo_profile_base_keystone_spec.rb
index 70bf90af4..ad7b0c039 100644
--- a/spec/classes/tripleo_profile_base_keystone_spec.rb
+++ b/spec/classes/tripleo_profile_base_keystone_spec.rb
@@ -61,10 +61,12 @@ describe 'tripleo::profile::base::keystone' do
       end
 
       it 'should trigger complete configuration' do
+        is_expected.to contain_class('keystone::cache').with(
+          :memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
+        )
         is_expected.to contain_class('keystone').with(
           :default_transport_url => 'rabbit://keystone1:foo@192.168.0.1:1234/?ssl=0',
           :notification_transport_url => 'rabbit://keystone2:baa@192.168.0.2:5678/?ssl=0',
-          :cache_memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
         )
         is_expected.to contain_class('keystone::config')
         is_expected.to contain_class('keystone::logging')
@@ -108,10 +110,12 @@ describe 'tripleo::profile::base::keystone' do
       end
 
       it 'should trigger keystone configuration' do
+        is_expected.to contain_class('keystone::cache').with(
+          :memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
+        )
         is_expected.to contain_class('keystone').with(
           :default_transport_url => 'rabbit://keystone1:foo@192.168.0.1:1234/?ssl=0',
           :notification_transport_url => 'rabbit://keystone2:baa@192.168.0.2:5678/?ssl=0',
-          :cache_memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
         )
         is_expected.to contain_class('keystone::config')
         is_expected.to contain_class('keystone::logging')
@@ -135,10 +139,12 @@ describe 'tripleo::profile::base::keystone' do
       end
 
       it 'should trigger keystone configuration' do
+        is_expected.to contain_class('keystone::cache').with(
+          :memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
+        )
         is_expected.to contain_class('keystone').with(
           :default_transport_url => 'rabbit://keystone1:foo@192.168.0.1:1234/?ssl=0',
           :notification_transport_url => 'rabbit://keystone2:baa@192.168.0.2:5678/?ssl=0',
-          :cache_memcache_servers => [ '192.168.0.3:11211', '192.168.0.4:11211', '192.168.0.5:11211' ],
         )
         is_expected.to contain_class('keystone::config')
         is_expected.to contain_class('keystone::logging')