Added template cache