better scalability for token checks, RT#71513