Turns out that previously we weren't updating the clip if the layout didn't change, even if the delegate was different.