Caves generating on water cause land to be excessively flooded

The Bug
When generating the new world in the new beta behind caves & cliffs toggle, the lake or rivers around the aquifers/water caves excessively flooding the land. You can compare the world with and without the caves & cliffs toggle. This was fixed in the Java snapshot before the new cave generation was disabled. (MC-214836)

Sample Seed and Coords:
-355161075
Coords: 175 ~ -414