We have 40oz klean kanteen bottles. That means we can carry 2.4 litres of water just in the waterbottles.
For cages I have that big velo orange cage and a Salsa anything cage. The salsa anything is handy in that I can fit a wool sock cozie on top of the bottle which keeps the liquid cooler. My wife uses the big velo orange cage and a zip tie cage, which is handy because the frame doesn't fit two large bottles in the conventional bottle cage drillings.
We like the steel bottles because there's no odour of flavor and they are easy to clean. And there's also the the sport cap which allows you to drink on the go which is really nice.