Moved ProxyHolder to separate class and updated test to Netty 4