If you drink caffeine to excess it will dehydrate you. I don't and, as its a liquid, I included it. TBH, as long as I'm not thirsty I don't care how much I drink. It's really not that important off cycle.
Totally agree with excess on caffeine. But never include it into daily intake. But exactly like u said drink until u aren't thirsty