Addition of ViewCache, separating cached views from view map