Fixing cache problem