Add caching for some views