Updated the ChannelFactory cache to a better implementation