We could retry for this and flavorRef on 500 but can be done in another PR