[realitygrill]

My impression (as a heritage speaker) is that cha's usage has simply broadened a bit, in the same way that American English has herbal teas and fruit teas. These also don't contain any tea, and have a different term, tisane. But both cha and tea still primarily refer to, well, tea leaves.