Ensure consistent getClient signature

Fixes #24