Fix: Speed up tokens API (refs #1212)
Merge pull request #1213 from btmills/faster-tokens

Fix: Speed up tokens API (refs #1212)