Add a token cache so that you can return tokens you've read...
