Make the test more robust
Improve #853, add comments and only apply when a BroadcasterCache has been configured