diff --git a/manifests/identity.pp b/manifests/identity.pp
index efde1256..113151bb 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -35,10 +35,6 @@
 #   (optional) Password to connect to keystone database
 #   Default value in params
 #
-# [*memcache_servers*]
-#   (optional) Memcached servers used by Keystone. Should be an array.
-#   Default value in params
-#
 # [*ks_admin_email*]
 #   (optional) Email address of admin user in Keystone
 #   Default value in params
@@ -323,6 +319,10 @@
 #   (optional) Syslog facility to receive log lines
 #   Defaults value in params
 #
+# [*token_driver*]
+#   (optional) Driver to store tokens
+#   Defaults to 'keystone.token.backends.sql.Token'
+#
 # [*token_expiration*]
 #   (optional) Amount of time a token should remain valid (in seconds)
 #   Defaults value in params
@@ -333,7 +333,6 @@ class cloud::identity (
   $keystone_db_host             = $os_params::keystone_db_host,
   $keystone_db_user             = $os_params::keystone_db_user,
   $keystone_db_password         = $os_params::keystone_db_password,
-  $memcache_servers             = $os_params::memcache_servers,
   $ks_admin_email               = $os_params::ks_admin_email,
   $ks_admin_password            = $os_params::ks_admin_password,
   $ks_admin_tenant              = $os_params::ks_admin_tenant,
@@ -397,8 +396,8 @@ class cloud::identity (
   $debug                        = $os_params::debug,
   $log_facility                 = $os_params::log_facility,
   $use_syslog                   = $os_params::use_syslog,
+  $token_driver                 = 'keystone.token.backends.sql.Token',
   $ks_token_expiration          = $os_params::ks_token_expiration,
-  $ks_token_driver              = 'keystone.token.backends.memcache.Token'
 ){
 
   # Disable twice logging if syslog is enabled
@@ -422,9 +421,7 @@ class cloud::identity (
     debug            => $debug,
     idle_timeout     => 60,
     log_facility     => $log_facility,
-    memcache_servers => $memcache_servers,
     sql_connection   => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone",
-    token_driver     => $ks_token_driver,
     token_provider   => 'keystone.token.providers.uuid.Provider',
     use_syslog       => $use_syslog,
     verbose          => $verbose,
@@ -432,6 +429,7 @@ class cloud::identity (
     log_dir          => $log_dir,
     public_port      => $ks_keystone_public_port,
     admin_port       => $ks_keystone_admin_port,
+    token_driver     => $token_driver,
     token_expiration => $ks_token_expiration
   }
 
diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb
index 4ee574e0..b5eb19bc 100644
--- a/spec/classes/cloud_identity_spec.rb
+++ b/spec/classes/cloud_identity_spec.rb
@@ -28,7 +28,6 @@ describe 'cloud::identity' do
         :keystone_db_host             => '10.0.0.1',
         :keystone_db_user             => 'keystone',
         :keystone_db_password         => 'secrete',
-        :memcache_servers             => ['10.0.0.1','10.0.0.2'],
         :ks_admin_email               => 'admin@openstack.org',
         :ks_admin_password            => 'secrete',
         :ks_admin_tenant              => 'admin',
@@ -89,9 +88,9 @@ describe 'cloud::identity' do
         :debug                        => true,
         :log_facility                 => 'LOG_LOCAL0',
         :use_syslog                   => true,
+        :token_driver                 => 'keystone.token.backends.sql.Token',
         :ks_token_expiration          => '3600',
-        :api_eth                      => '10.0.0.1',
-        :ks_token_driver              => 'keystone.token.backends.memcache.Token' }
+        :api_eth                      => '10.0.0.1' }
     end
 
     it 'configure keystone server' do
@@ -103,9 +102,8 @@ describe 'cloud::identity' do
         :verbose             => true,
         :idle_timeout        => '60',
         :log_facility        => 'LOG_LOCAL0',
-        :memcache_servers    => ['10.0.0.1','10.0.0.2'],
         :sql_connection      => 'mysql://keystone:secrete@10.0.0.1/keystone',
-        :token_driver        => 'keystone.token.backends.memcache.Token',
+        :token_driver        => 'keystone.token.backends.sql.Token',
         :token_provider      => 'keystone.token.providers.uuid.Provider',
         :use_syslog          => true,
         :bind_host           => '10.0.0.1',