Fix cache problem