Use eventual assert in overrides

Overrides are used when caps are renegotiated, not immediately. So it's
better to do the wait until dance to avoid a race condition.