Redo everything cache-related