token provider instantiation change