Add TemplateFinder
Update TemplateCacheGenerator
Update service definition
Merge branch 'add-template-finder'