Refactor PubSub to only use one connection for the fanout