Bug Fix: changed the way I am rendering and caching templates