Persist the client ID across sessions (fixes #151)