bug fixing
caching templates