I'm in the same boat; I can pretend with tea but it's not really the same experience.

Diet soda sometimes works, but often isn't provided as easily.