I can feel another experimiment coming on!

If it's caffeine you're trying to avoid you could try decaf but I expect you've already considered that. P went over to both decaf coffee and tea when his heart started playing up. He still has choccy though.