Fix cache builder