I did pound most of my water bottle before leaving the house.
It's been a long time since I've done a cleanse from caffeine, but I still seem to be able to wake up without it if I really need to, but I still enjoy it in the morning. I don't know, maybe it's just a baked in ritual at this point.
Glad you're feeling better!