Reverting caching changes