diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml
index 5f754a8764..485d1d85bf 100644
--- a/deployment/heat/heat-base-puppet.yaml
+++ b/deployment/heat/heat-base-puppet.yaml
@@ -211,7 +211,8 @@ outputs:
             heat::cache::enabled: {get_param: EnableCache}
             heat::cache::tls_enabled: {get_param: MemcachedTLS}
             heat::cache::resource_finder_caching: false
-            if:
+            heat::cache::backend:
+              if:
               - tls_cache_enabled
-              - heat::cache::backend: 'dogpile.cache.pymemcache'
-              - heat::cache::backend: 'dogpile.cache.memcached'
+              - 'dogpile.cache.pymemcache'
+              - 'dogpile.cache.memcached'
diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index 76dc5a8a92..97563a8bef 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -499,10 +499,11 @@ outputs:
           -
             keystone::cache::enabled: {get_param: EnableCache}
             keystone::cache::tls_enabled: {get_param: MemcachedTLS}
-            if:
-            - tls_cache_enabled
-            - keystone::cache::backend: 'dogpile.cache.pymemcache'
-            - keystone::cache::backend: 'dogpile.cache.memcached'
+            keystone::cache_backend:
+              if:
+              - tls_cache_enabled
+              - 'dogpile.cache.pymemcache'
+              - 'dogpile.cache.memcached'
           -
             if:
             - keystone_federation_enabled
diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml
index f94abdaa1a..2da8e56f3a 100644
--- a/deployment/nova/nova-base-puppet.yaml
+++ b/deployment/nova/nova-base-puppet.yaml
@@ -357,10 +357,11 @@ outputs:
         - get_attr: [RoleParametersValue, value]
         - nova::cache::enabled: {get_param: EnableCache}
           nova::cache::tls_enabled: {get_param: MemcachedTLS}
-          if:
+          nova::cache::backend:
+            if:
             - tls_cache_enabled
-            - nova::cache::backend: 'dogpile.cache.pymemcache'
-            - nova::cache::backend: 'dogpile.cache.memcached'
+            - 'dogpile.cache.pymemcache'
+            - 'dogpile.cache.memcached'
         - if:
           - compute_upgrade_level_empty
           - {}