Fix retrying safe put. Separate client lib.