DF-3968 needWaterPreppased now cached from previous frame