Fix missing import of wraps in marshal_with_field
Fix missing imports in marshal_with_field