Adds changes related to the caching