Fix cache class