Fix cache-rebuild failures