Fixed issues with templates and caching