fixed correct cache naming across templates
Merge branch 'refs/heads/hotfix-cache-naming'