Merge "Caching of changes"