Improve TokenUtils performance through caching
Merge pull request #9964 from MarcelGerber/find-blocks-perf

Improve TokenUtils performance through caching