Retry rpcs when augmenting entities and fallback to showing the incoming entity.