Stop ClientInfo being static.

I assume you'll want javadoc to be added?