Remove broken Cache support