Fix cache usage