Fixing cache builder