Fix cache classes