Refactored client API to support proper browse/lookup shutdown