I discovered something, quite by accident. If you drink no caffeine...none at all...you sleep way more deeply and wake up feeling much more rested. I was amazed. Even just 1 cup of coffee in the morning can affect your sleep a bit.
If you decide to try giving it up, do it very gradually, though.