Take two: avoid multiple token requests