I switched from sodas to tea & coffee for my caffeine, actually, when I stopped drinking soda I actually gave up caffeine entirely for 2 months (hardest 2 months of my life!)
Mostly I drink water though, around 2-3L per day. More if I work out.