Changes for caching logic.