Added template caching between requests