Update template cache manager
Remove module level normalization from template cache
test