Added two-tier caching policy