diff --git a/e2e/e2e.pb.go b/e2e/e2e.pb.go
index 1ad5260..289aea9 100644
--- a/e2e/e2e.pb.go
+++ b/e2e/e2e.pb.go
@@ -1,87 +1,84 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.11.4
 // source: e2e.proto
 
 package e2e
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 // Basic just tests basic fields, including oneofs and so on that don't
 // generally work automatically with encoding/json.
 type Basic struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	A string `protobuf:"bytes,1,opt,name=a,proto3" json:"a,omitempty"`
-	// Types that are valid to be assigned to B:
+	// Types that are assignable to B:
 	//	*Basic_Int
 	//	*Basic_Str
-	B                    isBasic_B         `protobuf_oneof:"b"`
-	Map                  map[string]string `protobuf:"bytes,4,rep,name=map,proto3" json:"map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
+	B   isBasic_B         `protobuf_oneof:"b"`
+	Map map[string]string `protobuf:"bytes,4,rep,name=map,proto3" json:"map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
-func (m *Basic) Reset()         { *m = Basic{} }
-func (m *Basic) String() string { return proto.CompactTextString(m) }
-func (*Basic) ProtoMessage()    {}
-func (*Basic) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4dd97aca76fff0f4, []int{0}
+func (x *Basic) Reset() {
+	*x = Basic{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_e2e_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
 
-func (m *Basic) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Basic.Unmarshal(m, b)
-}
-func (m *Basic) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Basic.Marshal(b, m, deterministic)
-}
-func (m *Basic) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Basic.Merge(m, src)
-}
-func (m *Basic) XXX_Size() int {
-	return xxx_messageInfo_Basic.Size(m)
-}
-func (m *Basic) XXX_DiscardUnknown() {
-	xxx_messageInfo_Basic.DiscardUnknown(m)
+func (x *Basic) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
 
-var xxx_messageInfo_Basic proto.InternalMessageInfo
+func (*Basic) ProtoMessage() {}
 
-func (m *Basic) GetA() string {
-	if m != nil {
-		return m.A
+func (x *Basic) ProtoReflect() protoreflect.Message {
+	mi := &file_e2e_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
 	}
-	return ""
+	return mi.MessageOf(x)
 }
 
-type isBasic_B interface {
-	isBasic_B()
-}
-
-type Basic_Int struct {
-	Int int32 `protobuf:"varint,2,opt,name=int,proto3,oneof"`
+// Deprecated: Use Basic.ProtoReflect.Descriptor instead.
+func (*Basic) Descriptor() ([]byte, []int) {
+	return file_e2e_proto_rawDescGZIP(), []int{0}
 }
 
-type Basic_Str struct {
-	Str string `protobuf:"bytes,3,opt,name=str,proto3,oneof"`
+func (x *Basic) GetA() string {
+	if x != nil {
+		return x.A
+	}
+	return ""
 }
 
-func (*Basic_Int) isBasic_B() {}
-
-func (*Basic_Str) isBasic_B() {}
-
 func (m *Basic) GetB() isBasic_B {
 	if m != nil {
 		return m.B
@@ -89,129 +86,242 @@ func (m *Basic) GetB() isBasic_B {
 	return nil
 }
 
-func (m *Basic) GetInt() int32 {
-	if x, ok := m.GetB().(*Basic_Int); ok {
+func (x *Basic) GetInt() int32 {
+	if x, ok := x.GetB().(*Basic_Int); ok {
 		return x.Int
 	}
 	return 0
 }
 
-func (m *Basic) GetStr() string {
-	if x, ok := m.GetB().(*Basic_Str); ok {
+func (x *Basic) GetStr() string {
+	if x, ok := x.GetB().(*Basic_Str); ok {
 		return x.Str
 	}
 	return ""
 }
 
-func (m *Basic) GetMap() map[string]string {
-	if m != nil {
-		return m.Map
+func (x *Basic) GetMap() map[string]string {
+	if x != nil {
+		return x.Map
 	}
 	return nil
 }
 
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*Basic) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*Basic_Int)(nil),
-		(*Basic_Str)(nil),
-	}
+type isBasic_B interface {
+	isBasic_B()
 }
 
-// Test nested types
-type Nested struct {
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+type Basic_Int struct {
+	Int int32 `protobuf:"varint,2,opt,name=int,proto3,oneof"`
 }
 
-func (m *Nested) Reset()         { *m = Nested{} }
-func (m *Nested) String() string { return proto.CompactTextString(m) }
-func (*Nested) ProtoMessage()    {}
-func (*Nested) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4dd97aca76fff0f4, []int{1}
+type Basic_Str struct {
+	Str string `protobuf:"bytes,3,opt,name=str,proto3,oneof"`
 }
 
-func (m *Nested) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Nested.Unmarshal(m, b)
-}
-func (m *Nested) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Nested.Marshal(b, m, deterministic)
+func (*Basic_Int) isBasic_B() {}
+
+func (*Basic_Str) isBasic_B() {}
+
+// Test nested types
+type Nested struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
-func (m *Nested) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Nested.Merge(m, src)
+
+func (x *Nested) Reset() {
+	*x = Nested{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_e2e_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *Nested) XXX_Size() int {
-	return xxx_messageInfo_Nested.Size(m)
+
+func (x *Nested) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *Nested) XXX_DiscardUnknown() {
-	xxx_messageInfo_Nested.DiscardUnknown(m)
+
+func (*Nested) ProtoMessage() {}
+
+func (x *Nested) ProtoReflect() protoreflect.Message {
+	mi := &file_e2e_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_Nested proto.InternalMessageInfo
+// Deprecated: Use Nested.ProtoReflect.Descriptor instead.
+func (*Nested) Descriptor() ([]byte, []int) {
+	return file_e2e_proto_rawDescGZIP(), []int{1}
+}
 
 type Nested_Message struct {
-	Basic                *Basic   `protobuf:"bytes,1,opt,name=basic,proto3" json:"basic,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Basic *Basic `protobuf:"bytes,1,opt,name=basic,proto3" json:"basic,omitempty"`
 }
 
-func (m *Nested_Message) Reset()         { *m = Nested_Message{} }
-func (m *Nested_Message) String() string { return proto.CompactTextString(m) }
-func (*Nested_Message) ProtoMessage()    {}
-func (*Nested_Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4dd97aca76fff0f4, []int{1, 0}
+func (x *Nested_Message) Reset() {
+	*x = Nested_Message{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_e2e_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
 
-func (m *Nested_Message) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Nested_Message.Unmarshal(m, b)
+func (x *Nested_Message) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *Nested_Message) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Nested_Message.Marshal(b, m, deterministic)
+
+func (*Nested_Message) ProtoMessage() {}
+
+func (x *Nested_Message) ProtoReflect() protoreflect.Message {
+	mi := &file_e2e_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
-func (m *Nested_Message) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Nested_Message.Merge(m, src)
+
+// Deprecated: Use Nested_Message.ProtoReflect.Descriptor instead.
+func (*Nested_Message) Descriptor() ([]byte, []int) {
+	return file_e2e_proto_rawDescGZIP(), []int{1, 0}
 }
-func (m *Nested_Message) XXX_Size() int {
-	return xxx_messageInfo_Nested_Message.Size(m)
+
+func (x *Nested_Message) GetBasic() *Basic {
+	if x != nil {
+		return x.Basic
+	}
+	return nil
 }
-func (m *Nested_Message) XXX_DiscardUnknown() {
-	xxx_messageInfo_Nested_Message.DiscardUnknown(m)
+
+var File_e2e_proto protoreflect.FileDescriptor
+
+var file_e2e_proto_rawDesc = []byte{
+	0x0a, 0x09, 0x65, 0x32, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x65, 0x32, 0x65,
+	0x22, 0xa1, 0x01, 0x0a, 0x05, 0x42, 0x61, 0x73, 0x69, 0x63, 0x12, 0x0c, 0x0a, 0x01, 0x61, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x61, 0x12, 0x12, 0x0a, 0x03, 0x69, 0x6e, 0x74, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x03, 0x69, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x03,
+	0x73, 0x74, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x03, 0x73, 0x74, 0x72,
+	0x12, 0x25, 0x0a, 0x03, 0x6d, 0x61, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e,
+	0x65, 0x32, 0x65, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x2e, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x52, 0x03, 0x6d, 0x61, 0x70, 0x1a, 0x36, 0x0a, 0x08, 0x4d, 0x61, 0x70, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42,
+	0x03, 0x0a, 0x01, 0x62, 0x22, 0x35, 0x0a, 0x06, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x1a, 0x2b,
+	0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x62, 0x61, 0x73,
+	0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x65, 0x32, 0x65, 0x2e, 0x42,
+	0x61, 0x73, 0x69, 0x63, 0x52, 0x05, 0x62, 0x61, 0x73, 0x69, 0x63, 0x42, 0x07, 0x5a, 0x05, 0x2e,
+	0x3b, 0x65, 0x32, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-var xxx_messageInfo_Nested_Message proto.InternalMessageInfo
+var (
+	file_e2e_proto_rawDescOnce sync.Once
+	file_e2e_proto_rawDescData = file_e2e_proto_rawDesc
+)
 
-func (m *Nested_Message) GetBasic() *Basic {
-	if m != nil {
-		return m.Basic
-	}
-	return nil
+func file_e2e_proto_rawDescGZIP() []byte {
+	file_e2e_proto_rawDescOnce.Do(func() {
+		file_e2e_proto_rawDescData = protoimpl.X.CompressGZIP(file_e2e_proto_rawDescData)
+	})
+	return file_e2e_proto_rawDescData
 }
 
-func init() {
-	proto.RegisterType((*Basic)(nil), "e2e.Basic")
-	proto.RegisterMapType((map[string]string)(nil), "e2e.Basic.MapEntry")
-	proto.RegisterType((*Nested)(nil), "e2e.Nested")
-	proto.RegisterType((*Nested_Message)(nil), "e2e.Nested.Message")
-}
-
-func init() { proto.RegisterFile("e2e.proto", fileDescriptor_4dd97aca76fff0f4) }
-
-var fileDescriptor_4dd97aca76fff0f4 = []byte{
-	// 210 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x8f, 0xc1, 0x4a, 0xc4, 0x30,
-	0x10, 0x86, 0x9d, 0x8d, 0x59, 0xed, 0xac, 0x07, 0x19, 0x3d, 0x84, 0x3d, 0x85, 0x05, 0xa1, 0x20,
-	0xf4, 0x10, 0x51, 0xc4, 0xe3, 0x82, 0xe0, 0xa5, 0x1e, 0xf2, 0x06, 0xa9, 0x0e, 0x52, 0xd4, 0xb6,
-	0x24, 0x51, 0xe8, 0xe3, 0xf8, 0xa6, 0x32, 0xa9, 0xb2, 0xb7, 0xfc, 0xff, 0x1f, 0xbe, 0x8f, 0xc1,
-	0x8a, 0x1d, 0x37, 0x53, 0x1c, 0xf3, 0x48, 0x8a, 0x1d, 0xef, 0x7e, 0x00, 0xf5, 0x3e, 0xa4, 0xfe,
-	0x85, 0xce, 0x10, 0x82, 0x01, 0x0b, 0x75, 0xe5, 0x21, 0x10, 0xa1, 0xea, 0x87, 0x6c, 0x56, 0x16,
-	0x6a, 0xfd, 0x74, 0xe4, 0x25, 0x48, 0x97, 0x72, 0x34, 0x4a, 0xfe, 0x48, 0x97, 0x72, 0xa4, 0x2b,
-	0x54, 0x9f, 0x61, 0x32, 0xc7, 0x56, 0xd5, 0x1b, 0x77, 0xd1, 0x08, 0xbd, 0xe0, 0x9a, 0x36, 0x4c,
-	0x8f, 0x43, 0x8e, 0xb3, 0x97, 0x7d, 0x7b, 0x87, 0xa7, 0xff, 0x05, 0x9d, 0xa3, 0x7a, 0xe7, 0xf9,
-	0x4f, 0x25, 0x4f, 0xba, 0x44, 0xfd, 0x1d, 0x3e, 0xbe, 0xb8, 0xe8, 0x2a, 0xbf, 0x84, 0x87, 0xd5,
-	0x3d, 0xec, 0x15, 0x42, 0xb7, 0xbb, 0xc5, 0xf5, 0x33, 0xa7, 0xcc, 0xaf, 0xdb, 0x6b, 0x3c, 0x69,
-	0x39, 0xa5, 0xf0, 0xc6, 0x64, 0x51, 0x77, 0x22, 0x2a, 0x9c, 0x8d, 0xc3, 0x83, 0xda, 0x2f, 0x43,
-	0xb7, 0x2e, 0x67, 0xde, 0xfc, 0x06, 0x00, 0x00, 0xff, 0xff, 0x80, 0x42, 0xea, 0x38, 0xf3, 0x00,
-	0x00, 0x00,
+var file_e2e_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_e2e_proto_goTypes = []interface{}{
+	(*Basic)(nil),          // 0: e2e.Basic
+	(*Nested)(nil),         // 1: e2e.Nested
+	nil,                    // 2: e2e.Basic.MapEntry
+	(*Nested_Message)(nil), // 3: e2e.Nested.Message
+}
+var file_e2e_proto_depIdxs = []int32{
+	2, // 0: e2e.Basic.map:type_name -> e2e.Basic.MapEntry
+	0, // 1: e2e.Nested.Message.basic:type_name -> e2e.Basic
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_e2e_proto_init() }
+func file_e2e_proto_init() {
+	if File_e2e_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_e2e_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Basic); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_e2e_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Nested); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_e2e_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Nested_Message); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_e2e_proto_msgTypes[0].OneofWrappers = []interface{}{
+		(*Basic_Int)(nil),
+		(*Basic_Str)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_e2e_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   4,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_e2e_proto_goTypes,
+		DependencyIndexes: file_e2e_proto_depIdxs,
+		MessageInfos:      file_e2e_proto_msgTypes,
+	}.Build()
+	File_e2e_proto = out.File
+	file_e2e_proto_rawDesc = nil
+	file_e2e_proto_goTypes = nil
+	file_e2e_proto_depIdxs = nil
 }
diff --git a/e2e/e2e.proto b/e2e/e2e.proto
index f2cceda..11e94c2 100644
--- a/e2e/e2e.proto
+++ b/e2e/e2e.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package e2e;
 
+option go_package = ".;e2e";
+
 // Basic just tests basic fields, including oneofs and so on that don't
 // generally work automatically with encoding/json.
 message Basic {
diff --git a/e2e/e2e_service.pb.go b/e2e/e2e_service.pb.go
index 646bf3f..efada90 100644
--- a/e2e/e2e_service.pb.go
+++ b/e2e/e2e_service.pb.go
@@ -1,33 +1,74 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.11.4
 // source: e2e_service.proto
 
 package e2e
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
-func init() { proto.RegisterFile("e2e_service.proto", fileDescriptor_67ff392e014f279c) }
-
-var fileDescriptor_67ff392e014f279c = []byte{
-	// 90 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4c, 0x35, 0x4a, 0x8d,
-	0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4e,
-	0x35, 0x4a, 0x95, 0xe2, 0x4c, 0x35, 0x82, 0xf2, 0x8d, 0x34, 0xb8, 0x98, 0x5d, 0x8d, 0x5c, 0x85,
-	0x14, 0xb9, 0x58, 0x3d, 0x52, 0x73, 0x72, 0xf2, 0x85, 0xb8, 0xf4, 0x40, 0x72, 0x4e, 0x89, 0xc5,
-	0x99, 0xc9, 0x52, 0x48, 0x6c, 0x25, 0x86, 0x24, 0x36, 0xb0, 0x06, 0x63, 0x40, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x60, 0x22, 0xc7, 0x12, 0x55, 0x00, 0x00, 0x00,
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
+
+var File_e2e_service_proto protoreflect.FileDescriptor
+
+var file_e2e_service_proto_rawDesc = []byte{
+	0x0a, 0x11, 0x65, 0x32, 0x65, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x03, 0x65, 0x32, 0x65, 0x1a, 0x09, 0x65, 0x32, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x32, 0x28, 0x0a, 0x03, 0x45, 0x32, 0x45, 0x12, 0x21, 0x0a, 0x05, 0x48, 0x65,
+	0x6c, 0x6c, 0x6f, 0x12, 0x0a, 0x2e, 0x65, 0x32, 0x65, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x1a,
+	0x0a, 0x2e, 0x65, 0x32, 0x65, 0x2e, 0x42, 0x61, 0x73, 0x69, 0x63, 0x22, 0x00, 0x42, 0x07, 0x5a,
+	0x05, 0x2e, 0x3b, 0x65, 0x32, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var file_e2e_service_proto_goTypes = []interface{}{
+	(*Basic)(nil), // 0: e2e.Basic
+}
+var file_e2e_service_proto_depIdxs = []int32{
+	0, // 0: e2e.E2E.Hello:input_type -> e2e.Basic
+	0, // 1: e2e.E2E.Hello:output_type -> e2e.Basic
+	1, // [1:2] is the sub-list for method output_type
+	0, // [0:1] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_e2e_service_proto_init() }
+func file_e2e_service_proto_init() {
+	if File_e2e_service_proto != nil {
+		return
+	}
+	file_e2e_proto_init()
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_e2e_service_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   0,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_e2e_service_proto_goTypes,
+		DependencyIndexes: file_e2e_service_proto_depIdxs,
+	}.Build()
+	File_e2e_service_proto = out.File
+	file_e2e_service_proto_rawDesc = nil
+	file_e2e_service_proto_goTypes = nil
+	file_e2e_service_proto_depIdxs = nil
 }
diff --git a/e2e/e2e_service.proto b/e2e/e2e_service.proto
index 6d09b43..1f72b99 100644
--- a/e2e/e2e_service.proto
+++ b/e2e/e2e_service.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package e2e;
 
+option go_package = ".;e2e";
+
 import "e2e.proto";
 
 service E2E {
diff --git a/go.mod b/go.mod
index 2561ff9..592d247 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,8 @@ go 1.12
 
 require (
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/protobuf v1.3.2
+	github.com/golang/protobuf v1.4.1
 	github.com/grpc-ecosystem/grpc-gateway v1.9.5
 	github.com/stretchr/testify v1.3.0
+	google.golang.org/protobuf v1.25.0
 )
diff --git a/go.sum b/go.sum
index dba2e98..c8f2219 100644
--- a/go.sum
+++ b/go.sum
@@ -1,8 +1,11 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
@@ -11,6 +14,19 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5 h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -20,26 +36,58 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 h1:+t9dhfO+GNOIGJof6kPOAenx7YgrZMTdRPV+EsnPabk=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=