diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 675e3110de..c26b61b921 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -213,7 +213,7 @@ function configure_manila {
     # Remove old conf file if exists
     rm -f $MANILA_CONF
 
-    configure_auth_token_middleware $MANILA_CONF manila  $MANILA_AUTH_CACHE_DIR
+    configure_keystone_authtoken_middleware $MANILA_CONF manila
 
     iniset $MANILA_CONF DEFAULT auth_strategy keystone
     iniset $MANILA_CONF DEFAULT debug True
@@ -253,13 +253,13 @@ function configure_manila {
     iniset $MANILA_CONF DEFAULT replica_state_update_interval $MANILA_REPLICA_STATE_UPDATE_INTERVAL
 
     if is_service_enabled neutron; then
-        configure_auth_token_middleware $MANILA_CONF neutron $MANILA_AUTH_CACHE_DIR neutron
+        configure_keystone_authtoken_middleware $MANILA_CONF neutron neutron
     fi
     if is_service_enabled nova; then
-        configure_auth_token_middleware $MANILA_CONF nova $MANILA_AUTH_CACHE_DIR nova
+        configure_keystone_authtoken_middleware $MANILA_CONF nova nova
     fi
     if is_service_enabled cinder; then
-        configure_auth_token_middleware $MANILA_CONF cinder $MANILA_AUTH_CACHE_DIR cinder
+        configure_keystone_authtoken_middleware $MANILA_CONF cinder cinder
     fi
 
     # Note: set up config group does not mean that this backend will be enabled.
@@ -662,11 +662,6 @@ function init_manila {
             fi
         fi
     fi
-
-    # Create cache dir
-    sudo mkdir -p $MANILA_AUTH_CACHE_DIR
-    sudo chown $STACK_USER $MANILA_AUTH_CACHE_DIR
-    rm -f $MANILA_AUTH_CACHE_DIR/*
 }
 
 # check_nfs_kernel_service_state_ubuntu- Make sure nfsd is running
diff --git a/devstack/settings b/devstack/settings
index 4e98fe3992..305e43d48c 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -42,7 +42,6 @@ MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$OSLO_LOCK_PATH}
 MANILA_LOCK_PATH=${MANILA_LOCK_PATH:=$MANILA_DIR/manila_locks}
 MANILACLIENT_DIR=${MANILACLIENT_DIR:=$DEST/python-manilaclient}
 MANILA_STATE_PATH=${MANILA_STATE_PATH:=$DATA_DIR/manila}
-MANILA_AUTH_CACHE_DIR=${MANILA_AUTH_CACHE_DIR:-/var/cache/manila}
 
 MANILA_CONF_DIR=${MANILA_CONF_DIR:-/etc/manila}
 MANILA_CONF=$MANILA_CONF_DIR/manila.conf