Made some performance changes to do with caching delegates in the message bus.