Why not just overcome your caffine dependency and just drink water? Coffee and tea are so overpriced, No True Mustachian™ would ever drink them.
With the TM I see you're probably pretty self aware and may be honestly asking. So I've gotta say - it's not a caffeine dependency, and it costs hardly anything.
I use an astounding six tablespoons of coffee when I make a french press worth, which is twice what an ordinary human would probably use. That's three ounces by volume and probably something like three-quarters of an ounce by weight. As mentioned above, my coffee costs me $5/lb. So for my crazy-strong, ultra-gourmet coffee, I'm paying approximately 25c/brew or 8c/cup. I haven't had coffee in three weeks or so, but damn if I don't enjoy it a whole lot when I do. It's a cheap thrill.
As for the tea - no way mi casa would function without a gallon of the stuff a day. You can take my oxygen before my iced tea. (At least it's not soda.)