Fix cache manager