Base-building tools to clear liquids

If you run into an underground water-filled cave, or lava pools (not sure if it happens with the current world gen, but I do remember it happening in Old Civ Facs) clearing them out can be annoying if you are digging trenches to bedrock, as you either have to use buckets, or place blocks then mine them again. A few possible ideas. 1. OG-style sponges (separate suggestion). 2. Sponges that don't block liquids from flowing into the 5x5 area, but clear a 5x5 area when placed and don't update the water so it doesn't flow back in (easier on server performance 3. Void buckets. An "infinite empty bucket" Would be effective for lava, but for water, the issue is that it will usually regen as an infinite source. One option could be for the infinite bucket to not update surrounding liquids if used, so it doesn't immediately replenish the source you picked up.