Since the 1.21.70-20 release, water generation is happening before or at the same time as cave, river, and feature shavers. (This does not involve upgraded worlds as seen in MCPE-189996.) This causes mangled water volumes and many dangerous situations where the player can fall to their death due to a water volume suddenly switching to open air. It also causes flowing water to be overly present in caves and makes caving an unpleasant experience, especially in Ancient Cities where the player cannot remain silent in water.

Steps to Reproduce:

• Create a new world in 1.22.70.xx in Creative Mode. The attached screenshots used seed 3525273462592995040.
• Turn on night vision and switch to spectator mode. Fly around and observe various volumes of water. The screenshots were taken at positions -253 64 -229,  820 -35 -250,  680 -7 -1070, and 358 -12 -1062.

Expected Results:

The generation should look like the two screenshots taken from 1.21.51, where water is enclosed in solid blocks. Refer to the two screenshots ending with the filename "v51".

Observed Results:

Water is cut off, resulting in unexpected changes to air. Refer to the four screenshots ending with the filename ending with "v70".