First part of porting #1141
Add BroadcasterCache Support
Fixes #1141