Revert all the Cache changes