Added cache and template