Clean up more obsolete cache stuff.