Merge pull request #8 from ldoblies/master

Quickfix Visitors
Improve handling of the token cache.