Fixing references to Core/Cache again?