Fixes #6 and #7 added directive template to the cache