Remove no longer used cache classes