Reworked the determination of the cage extend, again