Enhance unwrap on wrapper

Unwrap if requested class is the wrapped one.