Add client property to delay client instantiation until needed.