Revert "Revert use of ParamSpec for functools.wraps"
#16942
Merged
ParamSpec for functools.wraps"
#16942