added cached token and uid