Water caves cause land to be excessively flooded

The bug

With the change that caves near the surface generate with water, terrain has become excessively flooded. See screenshots.

Seed: 6927193748404355117

/execute in minecraft:overworld run tp @s -2175.26 129.80 1847.15 -205.08 48.21

/execute in minecraft:overworld run tp @s -116.22 108.49 424.47 54.08 41.37

/execute in minecraft:overworld run tp @s -81.34 120.49 720.25 -69.58 49.96