infinite water sources lower

on the version 1.17.10 they added you can try the 1.18 (caves and cliffs part 2) features. one thing I notices that i think they should fix is to make more infinite water sources at the lower parts of the world near lava and diamond level. I was playing on a world and forgot to get a water bucket and i was swimming up and trying to get water and i fell and died. and it would be more useful for other players too. please add this into the game.