Add caching to some views