Merge cache changes from master