Enhancement: #3 token now cached for re-use