Fixing TemplateCache