Adjusted caching flow.