Adapt to the latest Spring Framework snapshot