Cleaning up template caching a bit