Fix client decorator to wrap classmethods