Moved templates to template cache