Introduce template cache

 -clean up the names of some of the views