Perhaps.. You need to pass it somehow down. I reckon there's a lot of impact in the same area due to a number of related PRs. So, once stuff is in place we have oversight again and its time for some cleanup refactoring.. talking bout that, I'm currently improving the UT for #120 a bit, adding Iterables and Maps and narrowing the scope a bit to 1  or 2 methods so that you see missing imports.. found the first issue already.. ;-)