Cache token; Closes #2