diff --git a/manifests/cache.pp b/manifests/cache.pp
index f93b5fac..8a36dcb1 100644
--- a/manifests/cache.pp
+++ b/manifests/cache.pp
@@ -230,12 +230,12 @@
 #   the HashClient's internal mechanisms.
 #   Default to $facts['os_service_default']
 #
-# [*hashclient_retry_delay*]
+# [*hashclient_retry_timeout*]
 #   (Optional) Time in seconds that should pass between
 #   retry attempts in the HashClient's internal mechanisms.
 #   Default to $facts['os_service_default']
 #
-# [*dead_timeout*]
+# [*hashclient_dead_timeout*]
 #   (Optional) Time in seconds before attempting to add a node
 #   back in the pool in the HashClient's internal mechanisms.
 #   Default to $facts['os_service_default']
@@ -244,6 +244,18 @@
 #   (Optional) Whether to install the backend package for the cache.
 #   Defaults to true
 #
+# DEPRECATED PARAMETERS
+#
+# [*hashclient_retry_delay*]
+#   (Optional) Time in seconds that should pass between
+#   retry attempts in the HashClient's internal mechanisms.
+#   Default to undef
+#
+# [*dead_timeout*]
+#   (Optional) Time in seconds before attempting to add a node
+#   back in the pool in the HashClient's internal mechanisms.
+#   Default to undef
+#
 class heat::cache (
   $config_prefix                         = $facts['os_service_default'],
   $expiration_time                       = $facts['os_service_default'],
@@ -288,9 +300,12 @@ class heat::cache (
   $retry_attempts                        = $facts['os_service_default'],
   $retry_delay                           = $facts['os_service_default'],
   $hashclient_retry_attempts             = $facts['os_service_default'],
-  $hashclient_retry_delay                = $facts['os_service_default'],
-  $dead_timeout                          = $facts['os_service_default'],
+  $hashclient_retry_timeout              = $facts['os_service_default'],
+  $hashclient_dead_timeout               = $facts['os_service_default'],
   Boolean $manage_backend_package        = true,
+  # DEPRECATED PARAMETERS
+  $hashclient_retry_delay                = undef,
+  $dead_timeout                          = undef,
 ) {
   include heat::deps
 
@@ -332,9 +347,11 @@ class heat::cache (
     retry_attempts                       => $retry_attempts,
     retry_delay                          => $retry_delay,
     hashclient_retry_attempts            => $hashclient_retry_attempts,
+    hashclient_retry_timeout             => $hashclient_retry_timeout,
+    hashclient_dead_timeout              => $hashclient_dead_timeout,
+    manage_backend_package               => $manage_backend_package,
     hashclient_retry_delay               => $hashclient_retry_delay,
     dead_timeout                         => $dead_timeout,
-    manage_backend_package               => $manage_backend_package,
   }
 
   # all cache settings should be applied and all packages should be installed
diff --git a/spec/classes/heat_cache_spec.rb b/spec/classes/heat_cache_spec.rb
index 03aa5045..8f893287 100644
--- a/spec/classes/heat_cache_spec.rb
+++ b/spec/classes/heat_cache_spec.rb
@@ -48,9 +48,11 @@ describe 'heat::cache' do
           :retry_attempts                       => '<SERVICE DEFAULT>',
           :retry_delay                          => '<SERVICE DEFAULT>',
           :hashclient_retry_attempts            => '<SERVICE DEFAULT>',
-          :hashclient_retry_delay               => '<SERVICE DEFAULT>',
-          :dead_timeout                         => '<SERVICE DEFAULT>',
+          :hashclient_retry_timeout             => '<SERVICE DEFAULT>',
+          :hashclient_dead_timeout              => '<SERVICE DEFAULT>',
           :manage_backend_package               => true,
+          :hashclient_retry_delay               => nil,
+          :dead_timeout                         => nil,
         )
         is_expected.to contain_heat_config('constraint_validation_cache/caching').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_heat_config('constraint_validation_cache/expiration_time').with_value('<SERVICE DEFAULT>')
@@ -96,8 +98,8 @@ describe 'heat::cache' do
           :retry_attempts                        => 2,
           :retry_delay                           => 0,
           :hashclient_retry_attempts             => 2,
-          :hashclient_retry_delay                => 1,
-          :dead_timeout                          => 60,
+          :hashclient_retry_timeout              => 1,
+          :hashclient_dead_timeout               => 60,
           :manage_backend_package                => false,
           :constraint_validation_caching         => true,
           :constraint_validation_expiration_time => '3600',
@@ -105,6 +107,8 @@ describe 'heat::cache' do
           :service_extension_expiration_time     => '3600',
           :resource_finder_caching               => true,
           :resource_finder_expiration_time       => '3600',
+          :hashclient_retry_delay                => 3,
+          :dead_timeout                          => 61,
         }
       end
 
@@ -147,9 +151,11 @@ describe 'heat::cache' do
           :retry_attempts                       => 2,
           :retry_delay                          => 0,
           :hashclient_retry_attempts            => 2,
-          :hashclient_retry_delay               => 1,
-          :dead_timeout                         => 60,
+          :hashclient_retry_timeout             => 1,
+          :hashclient_dead_timeout              => 60,
           :manage_backend_package               => false,
+          :hashclient_retry_delay               => 3,
+          :dead_timeout                         => 61,
         )
         is_expected.to contain_heat_config('constraint_validation_cache/caching').with_value('true')
         is_expected.to contain_heat_config('constraint_validation_cache/expiration_time').with_value('3600')