diff --git a/cmd/migrate/main.go b/cmd/migrate/main.go
index 27a3b74b933b9..b5a2e6efd507a 100644
--- a/cmd/migrate/main.go
+++ b/cmd/migrate/main.go
@@ -360,7 +360,7 @@ func (m *chunkMover) moveChunks(ctx context.Context, threadID int, syncRangeCh <
 						}
 						if m.sourceUser != m.destUser {
 							// Because the incoming chunks are already encoded, to change the username we have to make a new chunk
-							nc := chunk.NewChunk(m.destUser, chk.Fingerprint, chk.Metric, chk.Data, chk.From, chk.Through)
+							nc := chunk.NewChunk(m.destUser, chk.FingerprintModel(), chk.Metric, chk.Data, chk.From, chk.Through)
 							err := nc.Encode()
 							if err != nil {
 								log.Println(threadID, "Failed to encode new chunk with new user:", err)
diff --git a/pkg/ingester/client/ingester.pb.go b/pkg/ingester/client/ingester.pb.go
index 62ad9420524c4..79efd548c0b09 100644
--- a/pkg/ingester/client/ingester.pb.go
+++ b/pkg/ingester/client/ingester.pb.go
@@ -1348,38 +1348,38 @@ func init() {
 }
 
 var fileDescriptor_5b6c87318632a5b2 = []byte{
-	// 1280 bytes of a gzipped FileDescriptorProto
+	// 1282 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0x1b, 0xc5,
 	0x17, 0xdf, 0x49, 0x9c, 0x1f, 0x7e, 0x76, 0x5c, 0x67, 0xd2, 0x1f, 0xe9, 0xf6, 0xdb, 0x4d, 0x3b,
-	0x5f, 0x21, 0x85, 0x02, 0x31, 0x4d, 0xa9, 0x44, 0x51, 0x85, 0x94, 0x86, 0x14, 0xd2, 0x26, 0x69,
+	0x5f, 0x21, 0x85, 0x16, 0x62, 0x9a, 0x52, 0x89, 0x22, 0x84, 0x94, 0x86, 0x14, 0xd2, 0x26, 0x69,
 	0xbb, 0x49, 0x29, 0x42, 0x48, 0xd6, 0xc4, 0x9e, 0x38, 0xab, 0xec, 0x0f, 0x77, 0x67, 0x16, 0x91,
 	0x1b, 0x12, 0x7f, 0x00, 0x1c, 0x10, 0x27, 0xae, 0x48, 0xfc, 0x05, 0x70, 0xe7, 0xd4, 0x63, 0x8f,
 	0x15, 0x87, 0x8a, 0xba, 0x17, 0x8e, 0x95, 0xf8, 0x07, 0xd0, 0xce, 0xcc, 0xae, 0x77, 0xd7, 0xb1,
 	0x9b, 0x4a, 0x2d, 0x37, 0xcf, 0x7b, 0x9f, 0xfd, 0xcc, 0x67, 0xde, 0x7b, 0x33, 0xef, 0x19, 0x48,
 	0xf7, 0xa0, 0xd3, 0x70, 0xfc, 0x0e, 0xe3, 0x82, 0x85, 0x8d, 0x96, 0xeb, 0x30, 0x5f, 0xa4, 0xeb,
-	0xa5, 0x6e, 0x18, 0x88, 0x00, 0x43, 0xb2, 0xee, 0xee, 0x9a, 0xef, 0x75, 0x1c, 0xb1, 0x1f, 0xed,
+	0xa5, 0x6e, 0x18, 0x88, 0x00, 0x43, 0xb2, 0xee, 0xee, 0x9a, 0xef, 0x76, 0x1c, 0xb1, 0x1f, 0xed,
 	0x2e, 0xb5, 0x02, 0xaf, 0xd1, 0x09, 0x3a, 0x41, 0x43, 0x42, 0x76, 0xa3, 0x3d, 0xb9, 0x92, 0x0b,
 	0xf9, 0x4b, 0x7d, 0x6a, 0x9a, 0x31, 0xbd, 0x1b, 0x74, 0x94, 0xc3, 0x63, 0x22, 0x74, 0x5a, 0x5c,
 	0xfb, 0xce, 0xe5, 0x7c, 0xc9, 0x0f, 0xe5, 0x24, 0x2b, 0x50, 0xb1, 0x19, 0x6d, 0xdb, 0xec, 0x61,
 	0xc4, 0xb8, 0xc0, 0xcb, 0x30, 0xf5, 0x30, 0x62, 0xa1, 0xc3, 0xf8, 0x3c, 0xba, 0x30, 0xbe, 0x58,
 	0x59, 0x9e, 0x5f, 0xea, 0x8b, 0x5a, 0xba, 0x17, 0xb1, 0xf0, 0x50, 0x43, 0xed, 0x04, 0x48, 0x56,
-	0xa1, 0xaa, 0x28, 0x78, 0x37, 0xf0, 0x39, 0xc3, 0x57, 0x60, 0x2a, 0x64, 0x3c, 0x72, 0x45, 0xc2,
-	0x71, 0xf6, 0x08, 0x0e, 0x85, 0xb5, 0x13, 0x24, 0xf9, 0x19, 0x41, 0x35, 0x4b, 0x8f, 0xdf, 0x05,
+	0xa1, 0xaa, 0x28, 0x78, 0x37, 0xf0, 0x39, 0xc3, 0x57, 0x61, 0x2a, 0x64, 0x3c, 0x72, 0x45, 0xc2,
+	0x71, 0xf6, 0x08, 0x0e, 0x85, 0xb5, 0x13, 0x24, 0xf9, 0x19, 0x41, 0x35, 0x4b, 0x8f, 0xdf, 0x01,
 	0xcc, 0x05, 0x0d, 0x45, 0x53, 0x38, 0x1e, 0xe3, 0x82, 0x7a, 0xdd, 0xa6, 0x17, 0x13, 0xa2, 0xc5,
 	0x71, 0xbb, 0x2e, 0x3d, 0x3b, 0x89, 0x63, 0x93, 0xe3, 0x45, 0xa8, 0x33, 0xbf, 0x9d, 0xc7, 0x8e,
-	0x49, 0x6c, 0x8d, 0xf9, 0xed, 0x2c, 0xf2, 0x03, 0x98, 0xf6, 0xa8, 0x68, 0xed, 0xb3, 0x90, 0xcf,
+	0x49, 0x6c, 0x8d, 0xf9, 0xed, 0x2c, 0xf2, 0x7d, 0x98, 0xf6, 0xa8, 0x68, 0xed, 0xb3, 0x90, 0xcf,
 	0x8f, 0x0f, 0x1e, 0x71, 0x83, 0xee, 0x32, 0x77, 0x53, 0x01, 0xec, 0x14, 0x49, 0x7e, 0x41, 0x70,
-	0x72, 0xed, 0x1b, 0xe6, 0x75, 0x5d, 0x1a, 0xfe, 0x27, 0x32, 0xaf, 0x0e, 0xc8, 0x3c, 0x3b, 0x4c,
-	0x26, 0xcf, 0xe8, 0xbc, 0x0d, 0x33, 0xb9, 0x00, 0xe3, 0x8f, 0x00, 0xe4, 0x6e, 0xd9, 0x9c, 0x9e,
+	0x72, 0xed, 0x1b, 0xe6, 0x75, 0x5d, 0x1a, 0xfe, 0x27, 0x32, 0xaf, 0x0d, 0xc8, 0x3c, 0x3b, 0x4c,
+	0x26, 0xcf, 0xe8, 0xbc, 0x0d, 0x33, 0xb9, 0x00, 0xe3, 0x0f, 0x01, 0xe4, 0x6e, 0xd9, 0x9c, 0x9e,
 	0x5c, 0x4a, 0x8b, 0x20, 0xde, 0x72, 0x5b, 0xfa, 0x6e, 0x94, 0x1e, 0x3d, 0x5d, 0x30, 0xec, 0x0c,
 	0x9a, 0xfc, 0x84, 0x60, 0x4e, 0xb2, 0x6d, 0x8b, 0x90, 0x51, 0x2f, 0xe5, 0x5c, 0x85, 0x4a, 0x6b,
 	0x3f, 0xf2, 0x0f, 0x72, 0xa4, 0xe7, 0xb2, 0xf2, 0xfa, 0xb4, 0xab, 0x31, 0x50, 0x73, 0x67, 0xbf,
 	0x2a, 0x08, 0x1b, 0x7b, 0x25, 0x61, 0xdb, 0x70, 0xaa, 0x90, 0x8c, 0xd7, 0x70, 0xda, 0x3f, 0x10,
 	0x60, 0x19, 0xd6, 0xcf, 0xa9, 0x1b, 0x31, 0x9e, 0x24, 0xf8, 0x3c, 0x80, 0x1b, 0x5b, 0x9b, 0x3e,
 	0xf5, 0x98, 0x4c, 0x6c, 0xd9, 0x2e, 0x4b, 0xcb, 0x16, 0xf5, 0xd8, 0x90, 0xfc, 0x8f, 0xbd, 0x42,
-	0xfe, 0xc7, 0x5f, 0x9a, 0xff, 0xd2, 0x05, 0x74, 0xdc, 0xfc, 0x7f, 0x08, 0x73, 0xb9, 0x33, 0xe8,
+	0xfe, 0xc7, 0x5f, 0x9a, 0xff, 0xd2, 0x05, 0x74, 0xdc, 0xfc, 0x7f, 0x00, 0x73, 0xb9, 0x33, 0xe8,
 	0xb8, 0x5c, 0x84, 0xaa, 0x3a, 0xc4, 0xd7, 0xd2, 0x2e, 0x23, 0x53, 0xb6, 0x2b, 0x6e, 0x1f, 0x4a,
-	0x0e, 0x60, 0x76, 0x23, 0x39, 0x15, 0x7f, 0xc3, 0xd5, 0x4d, 0xae, 0xea, 0x50, 0xeb, 0xcd, 0xb4,
+	0x0e, 0x60, 0x76, 0x23, 0x39, 0x15, 0x7f, 0xc3, 0xd5, 0x4d, 0xae, 0xe9, 0x50, 0xeb, 0xcd, 0xb4,
 	0xca, 0x05, 0xa8, 0xf4, 0x43, 0x9d, 0x88, 0x84, 0x34, 0xd6, 0x9c, 0x60, 0xa8, 0xdf, 0xe7, 0x2c,
 	0xdc, 0x16, 0x54, 0x24, 0x12, 0xc9, 0xef, 0x08, 0x66, 0x33, 0x46, 0x4d, 0xf5, 0x16, 0xd4, 0x54,
 	0xb4, 0x9c, 0xc0, 0x6f, 0x86, 0x54, 0xa8, 0xcc, 0x21, 0x7b, 0x26, 0xb5, 0xda, 0x54, 0xb0, 0x38,
@@ -1387,48 +1387,49 @@ var fileDescriptor_5b6c87318632a5b2 = []byte{
 	0xf8, 0xb4, 0xeb, 0x34, 0x0b, 0x4c, 0xe3, 0x92, 0xa9, 0x4e, 0xbb, 0xce, 0x7a, 0x8e, 0x6c, 0x09,
 	0xe6, 0xc2, 0xc8, 0x65, 0x45, 0x78, 0x49, 0xc2, 0x67, 0x63, 0x57, 0x0e, 0x4f, 0x28, 0xcc, 0xc5,
 	0xc2, 0xd7, 0x3f, 0xc9, 0x4b, 0x3f, 0x03, 0x53, 0x11, 0x67, 0x61, 0xd3, 0x69, 0xeb, 0x6a, 0x9b,
-	0x8c, 0x97, 0xeb, 0x6d, 0x7c, 0x19, 0x4a, 0x6d, 0x2a, 0xa8, 0x94, 0x59, 0x59, 0x3e, 0x9f, 0x2d,
-	0x87, 0x81, 0x00, 0xd8, 0x12, 0x4a, 0x6e, 0x03, 0x8e, 0x5d, 0x3c, 0xbf, 0xc3, 0x55, 0x98, 0xe0,
+	0x8c, 0x97, 0xeb, 0x6d, 0x7c, 0x05, 0x4a, 0x6d, 0x2a, 0xa8, 0x94, 0x59, 0x59, 0x3e, 0x9f, 0x2d,
+	0x87, 0x81, 0x00, 0xd8, 0x12, 0x4a, 0x6e, 0x03, 0x8e, 0x5d, 0x3c, 0xbf, 0xc3, 0x35, 0x98, 0xe0,
 	0xb1, 0x41, 0x5f, 0x90, 0x85, 0x22, 0x53, 0x41, 0x91, 0xad, 0xd0, 0xe4, 0x37, 0x04, 0xd6, 0xa6,
-	0xea, 0x2c, 0x37, 0x83, 0x30, 0x5f, 0x81, 0x6f, 0xf8, 0x35, 0xbc, 0x0e, 0xd5, 0xa4, 0xc4, 0x9b,
-	0x9c, 0x89, 0x97, 0xbf, 0x88, 0x95, 0x04, 0xbe, 0xcd, 0x04, 0xb9, 0x0d, 0x0b, 0x43, 0x75, 0xeb,
-	0x90, 0x2c, 0xc2, 0xa4, 0x6a, 0x9a, 0x3a, 0x26, 0xf5, 0xfe, 0xa3, 0xa1, 0x3e, 0xb5, 0xb5, 0x9f,
-	0xcc, 0xc3, 0x69, 0x4d, 0xb6, 0xc9, 0x04, 0x8d, 0xa3, 0x9c, 0x54, 0xe2, 0x1d, 0x38, 0x33, 0xe0,
-	0xd1, 0xf4, 0x71, 0xd3, 0xd1, 0xb6, 0xb4, 0xaf, 0x16, 0x36, 0x48, 0xbf, 0x49, 0x91, 0xe4, 0x1f,
-	0x04, 0x27, 0x0a, 0x2f, 0x69, 0x1c, 0xb3, 0xbd, 0x30, 0xf0, 0x9a, 0xc9, 0xc9, 0xfb, 0x65, 0x52,
-	0x8b, 0xed, 0xeb, 0xda, 0xbc, 0xde, 0xce, 0xd6, 0xd1, 0x58, 0xae, 0x8e, 0x5c, 0x98, 0x94, 0x77,
-	0xaa, 0xdf, 0x58, 0x52, 0x29, 0x1b, 0xac, 0x43, 0x5b, 0x87, 0x32, 0x44, 0x77, 0xa9, 0x13, 0xde,
-	0xb8, 0x16, 0xbf, 0x92, 0x7f, 0x3e, 0x5d, 0xb8, 0x9c, 0x9d, 0x46, 0x42, 0xba, 0x47, 0x7d, 0xda,
-	0x70, 0x83, 0x03, 0xa7, 0x91, 0x1d, 0x2d, 0x54, 0x0a, 0x56, 0xda, 0xb4, 0x2b, 0x58, 0x68, 0xeb,
-	0x3d, 0x70, 0x03, 0x26, 0xd5, 0xb3, 0x3f, 0x5f, 0x92, 0xbb, 0xcd, 0x66, 0x93, 0x96, 0xed, 0x0e,
-	0x1a, 0x46, 0xbe, 0x47, 0x30, 0xa1, 0xce, 0xfa, 0xa6, 0xaa, 0xc9, 0x84, 0x69, 0xe6, 0xb7, 0x82,
-	0xb6, 0xe3, 0x77, 0xe4, 0x65, 0x9e, 0xb0, 0xd3, 0x35, 0xc6, 0xfa, 0x92, 0xc5, 0xb7, 0xb6, 0xaa,
-	0x6f, 0xd1, 0x3c, 0x9c, 0xde, 0x09, 0xa9, 0xcf, 0xf7, 0x58, 0x28, 0x85, 0xa5, 0x65, 0x43, 0xd6,
-	0x60, 0x26, 0x57, 0x4f, 0xb9, 0xe9, 0x02, 0x1d, 0x7b, 0xba, 0x68, 0x41, 0x35, 0xeb, 0xc1, 0x6f,
-	0x43, 0x49, 0x1c, 0x76, 0xd5, 0x9b, 0x55, 0x5b, 0x3e, 0x95, 0x65, 0x90, 0x90, 0x9d, 0xc3, 0x2e,
-	0xb3, 0x25, 0x24, 0xd6, 0x2b, 0x1b, 0x93, 0x4a, 0xb1, 0xfc, 0x8d, 0x4f, 0xc2, 0x84, 0x7c, 0xe7,
-	0xe5, 0xe1, 0xca, 0xb6, 0x5a, 0x90, 0xef, 0x10, 0xd4, 0xfa, 0xd5, 0x74, 0xd3, 0x71, 0xd9, 0xeb,
-	0x28, 0x26, 0x13, 0xa6, 0xf7, 0x1c, 0x97, 0x49, 0x0d, 0x6a, 0xbb, 0x74, 0x7d, 0x54, 0x2c, 0x2f,
-	0xdd, 0x82, 0x72, 0x7a, 0x04, 0x5c, 0x86, 0x89, 0xb5, 0x7b, 0xf7, 0x57, 0x36, 0xea, 0x06, 0x9e,
-	0x81, 0xf2, 0xd6, 0x9d, 0x9d, 0xa6, 0x5a, 0x22, 0x7c, 0x02, 0x2a, 0xf6, 0xda, 0xa7, 0x6b, 0x5f,
-	0x34, 0x37, 0x57, 0x76, 0x56, 0x3f, 0xab, 0x8f, 0x61, 0x0c, 0x35, 0x65, 0xd8, 0xba, 0xa3, 0x6d,
-	0xe3, 0xcb, 0x3f, 0x4e, 0xc1, 0x74, 0xa2, 0x11, 0x5f, 0x83, 0xd2, 0xdd, 0x88, 0xef, 0xe3, 0xd3,
-	0xfd, 0x6a, 0x7e, 0x10, 0x3a, 0x82, 0xe9, 0xdb, 0x69, 0x9e, 0x19, 0xb0, 0xeb, 0x1c, 0x1a, 0xf8,
-	0x63, 0x98, 0x90, 0x63, 0x04, 0x1e, 0x3a, 0xec, 0x9a, 0xc3, 0x47, 0x58, 0x62, 0xe0, 0x0d, 0xa8,
-	0x64, 0xc6, 0xa4, 0x11, 0x2c, 0x0b, 0x03, 0x9e, 0xfc, 0x64, 0x45, 0x8c, 0xf7, 0x11, 0x7e, 0x00,
-	0x35, 0xe9, 0x4a, 0x26, 0x1c, 0x8e, 0x2f, 0x64, 0x3f, 0x3b, 0x6a, 0x0a, 0x35, 0x2f, 0x8e, 0x40,
-	0xa4, 0x32, 0xef, 0x42, 0x25, 0x33, 0x1b, 0x60, 0x6b, 0xa0, 0x30, 0x73, 0x83, 0x4f, 0x5e, 0xec,
-	0x11, 0x43, 0x05, 0x31, 0xf0, 0x26, 0x40, 0xbf, 0x8d, 0xe3, 0xf3, 0x03, 0x1f, 0x64, 0x67, 0x09,
-	0xd3, 0x1a, 0xe6, 0x4e, 0xe9, 0x6e, 0x41, 0x39, 0x6d, 0x64, 0xf8, 0x7f, 0x43, 0xfa, 0x9b, 0x22,
-	0x1b, 0xdd, 0xfd, 0x88, 0x81, 0xb7, 0xa0, 0xba, 0xe2, 0xba, 0xc7, 0xa5, 0xb3, 0x8a, 0x5e, 0x5e,
-	0xe4, 0x13, 0xe9, 0xe3, 0x5e, 0xec, 0x21, 0xf8, 0x52, 0xee, 0x7e, 0x8e, 0x6c, 0x90, 0xe6, 0x3b,
+	0xea, 0x2c, 0x37, 0x83, 0x30, 0x5f, 0x81, 0x6f, 0xf8, 0x35, 0xfc, 0x08, 0xaa, 0x49, 0x89, 0x37,
+	0x39, 0x13, 0x2f, 0x7f, 0x11, 0x2b, 0x09, 0x7c, 0x9b, 0x09, 0x72, 0x1b, 0x16, 0x86, 0xea, 0xd6,
+	0x21, 0x59, 0x84, 0x49, 0xd5, 0x34, 0x75, 0x4c, 0xea, 0xfd, 0x47, 0x43, 0x7d, 0x6a, 0x6b, 0x3f,
+	0x99, 0x87, 0xd3, 0x9a, 0x6c, 0x93, 0x09, 0x1a, 0x47, 0x39, 0xa9, 0xc4, 0x3b, 0x70, 0x66, 0xc0,
+	0xa3, 0xe9, 0xe3, 0xa6, 0xa3, 0x6d, 0x69, 0x5f, 0x2d, 0x6c, 0x90, 0x7e, 0x93, 0x22, 0xc9, 0x3f,
+	0x08, 0x4e, 0x14, 0x5e, 0xd2, 0x38, 0x66, 0x7b, 0x61, 0xe0, 0x35, 0x93, 0x93, 0xf7, 0xcb, 0xa4,
+	0x16, 0xdb, 0xd7, 0xb5, 0x79, 0xbd, 0x9d, 0xad, 0xa3, 0xb1, 0x5c, 0x1d, 0xb9, 0x30, 0x29, 0xef,
+	0x54, 0xbf, 0xb1, 0xa4, 0x52, 0x36, 0x58, 0x87, 0xb6, 0x0e, 0x65, 0x88, 0xee, 0x52, 0x27, 0xbc,
+	0x71, 0x3d, 0x7e, 0x25, 0xff, 0x7c, 0xba, 0x70, 0x25, 0x3b, 0x8d, 0x84, 0x74, 0x8f, 0xfa, 0xb4,
+	0xe1, 0x06, 0x07, 0x4e, 0x23, 0x3b, 0x5a, 0xa8, 0x14, 0xac, 0xb4, 0x69, 0x57, 0xb0, 0xd0, 0xd6,
+	0x7b, 0xe0, 0x06, 0x4c, 0xaa, 0x67, 0x7f, 0xbe, 0x24, 0x77, 0x9b, 0xcd, 0x26, 0x2d, 0xdb, 0x1d,
+	0x34, 0x8c, 0x7c, 0x8f, 0x60, 0x42, 0x9d, 0xf5, 0x4d, 0x55, 0x93, 0x09, 0xd3, 0xcc, 0x6f, 0x05,
+	0x6d, 0xc7, 0xef, 0xc8, 0xcb, 0x3c, 0x61, 0xa7, 0x6b, 0x8c, 0xf5, 0x25, 0x8b, 0x6f, 0x6d, 0x55,
+	0xdf, 0xa2, 0x79, 0x38, 0xbd, 0x13, 0x52, 0x9f, 0xef, 0xb1, 0x50, 0x0a, 0x4b, 0xcb, 0x86, 0xac,
+	0xc1, 0x4c, 0xae, 0x9e, 0x72, 0xd3, 0x05, 0x3a, 0xf6, 0x74, 0xd1, 0x82, 0x6a, 0xd6, 0x83, 0xdf,
+	0x86, 0x92, 0x38, 0xec, 0xaa, 0x37, 0xab, 0xb6, 0x7c, 0x2a, 0xcb, 0x20, 0x21, 0x3b, 0x87, 0x5d,
+	0x66, 0x4b, 0x48, 0xac, 0x57, 0x36, 0x26, 0x95, 0x62, 0xf9, 0x1b, 0x9f, 0x84, 0x09, 0xf9, 0xce,
+	0xcb, 0xc3, 0x95, 0x6d, 0xb5, 0x20, 0xdf, 0x21, 0xa8, 0xf5, 0xab, 0xe9, 0xa6, 0xe3, 0xb2, 0xd7,
+	0x51, 0x4c, 0x26, 0x4c, 0xef, 0x39, 0x2e, 0x93, 0x1a, 0xd4, 0x76, 0xe9, 0xfa, 0xa8, 0x58, 0x5e,
+	0xba, 0x05, 0xe5, 0xf4, 0x08, 0xb8, 0x0c, 0x13, 0x6b, 0xf7, 0xee, 0xaf, 0x6c, 0xd4, 0x0d, 0x3c,
+	0x03, 0xe5, 0xad, 0x3b, 0x3b, 0x4d, 0xb5, 0x44, 0xf8, 0x04, 0x54, 0xec, 0xb5, 0x4f, 0xd7, 0xbe,
+	0x68, 0x6e, 0xae, 0xec, 0xac, 0x7e, 0x56, 0x1f, 0xc3, 0x18, 0x6a, 0xca, 0xb0, 0x75, 0x47, 0xdb,
+	0xc6, 0x97, 0x7f, 0x9c, 0x82, 0xe9, 0x44, 0x23, 0xbe, 0x0e, 0xa5, 0xbb, 0x11, 0xdf, 0xc7, 0xa7,
+	0xfb, 0xd5, 0xfc, 0x20, 0x74, 0x04, 0xd3, 0xb7, 0xd3, 0x3c, 0x33, 0x60, 0xd7, 0x39, 0x34, 0xf0,
+	0xc7, 0x30, 0x21, 0xc7, 0x08, 0x3c, 0x74, 0xd8, 0x35, 0x87, 0x8f, 0xb0, 0xc4, 0xc0, 0x1b, 0x50,
+	0xc9, 0x8c, 0x49, 0x23, 0x58, 0x16, 0x06, 0x3c, 0xf9, 0xc9, 0x8a, 0x18, 0xef, 0x21, 0xfc, 0x00,
+	0x6a, 0xd2, 0x95, 0x4c, 0x38, 0x1c, 0x5f, 0xc8, 0x7e, 0x76, 0xd4, 0x14, 0x6a, 0x5e, 0x1c, 0x81,
+	0x48, 0x65, 0xde, 0x85, 0x4a, 0x66, 0x36, 0xc0, 0xd6, 0x40, 0x61, 0xe6, 0x06, 0x9f, 0xbc, 0xd8,
+	0x23, 0x86, 0x0a, 0x62, 0xe0, 0x4d, 0x80, 0x7e, 0x1b, 0xc7, 0xe7, 0x07, 0x3e, 0xc8, 0xce, 0x12,
+	0xa6, 0x35, 0xcc, 0x9d, 0xd2, 0xdd, 0x82, 0x72, 0xda, 0xc8, 0xf0, 0xff, 0x86, 0xf4, 0x37, 0x45,
+	0x36, 0xba, 0xfb, 0x11, 0x03, 0x6f, 0x41, 0x75, 0xc5, 0x75, 0x8f, 0x4b, 0x67, 0x15, 0xbd, 0xbc,
+	0xc8, 0x27, 0xd2, 0xc7, 0xbd, 0xd8, 0x43, 0xf0, 0xa5, 0xdc, 0xfd, 0x1c, 0xd9, 0x20, 0xcd, 0xcb,
 	0xc7, 0xc2, 0xa6, 0xbb, 0x7e, 0x05, 0x27, 0x0a, 0x2d, 0x05, 0x93, 0x23, 0x18, 0x0a, 0x9d, 0xc8,
 	0xfc, 0xff, 0x48, 0x4c, 0xca, 0x7e, 0x1f, 0x6a, 0xf9, 0x77, 0x0d, 0x8f, 0x1a, 0xe2, 0xcd, 0xdc,
-	0xce, 0x43, 0x1e, 0x44, 0x63, 0x11, 0xdd, 0xb8, 0xfe, 0xf8, 0x99, 0x65, 0x3c, 0x79, 0x66, 0x19,
-	0x2f, 0x9e, 0x59, 0xe8, 0xdb, 0x9e, 0x85, 0x7e, 0xed, 0x59, 0xe8, 0x51, 0xcf, 0x42, 0x8f, 0x7b,
-	0x16, 0xfa, 0xab, 0x67, 0xa1, 0xbf, 0x7b, 0x96, 0xf1, 0xa2, 0x67, 0xa1, 0x1f, 0x9e, 0x5b, 0xc6,
-	0xe3, 0xe7, 0x96, 0xf1, 0xe4, 0xb9, 0x65, 0x7c, 0x39, 0xa9, 0xfe, 0x13, 0xef, 0x4e, 0xca, 0x3b,
-	0x7a, 0xe5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xdf, 0x44, 0xc1, 0x31, 0x0f, 0x00, 0x00,
+	0xce, 0x43, 0x1e, 0x44, 0x63, 0x11, 0xdd, 0xa0, 0x8f, 0x9f, 0x59, 0xc6, 0x93, 0x67, 0x96, 0xf1,
+	0xe2, 0x99, 0x85, 0xbe, 0xed, 0x59, 0xe8, 0xd7, 0x9e, 0x85, 0x1e, 0xf5, 0x2c, 0xf4, 0xb8, 0x67,
+	0xa1, 0xbf, 0x7a, 0x16, 0xfa, 0xbb, 0x67, 0x19, 0x2f, 0x7a, 0x16, 0xfa, 0xe1, 0xb9, 0x65, 0x3c,
+	0x7e, 0x6e, 0x19, 0x4f, 0x9e, 0x5b, 0xc6, 0x97, 0x97, 0x47, 0xb5, 0x98, 0xc2, 0x1f, 0xe7, 0xdd,
+	0x49, 0x79, 0x91, 0xaf, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x59, 0x14, 0xfe, 0xa8, 0x56, 0x0f,
+	0x00, 0x00,
 }
 
 func (x MatchType) String() string {
diff --git a/pkg/ingester/client/ingester.proto b/pkg/ingester/client/ingester.proto
index c1cecc1a17f94..c24cfc67637f1 100644
--- a/pkg/ingester/client/ingester.proto
+++ b/pkg/ingester/client/ingester.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package ingesterpb;
 
-option go_package = "client";
+option go_package = "github.com/grafana/loki/pkg/ingester/client";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "pkg/logproto/metrics.proto";
diff --git a/pkg/ingester/flush_test.go b/pkg/ingester/flush_test.go
index 831a095a99151..cdf1989e4660b 100644
--- a/pkg/ingester/flush_test.go
+++ b/pkg/ingester/flush_test.go
@@ -179,8 +179,8 @@ func TestFlushingCollidingLabels(t *testing.T) {
 	// make sure all chunks have different fingerprint, even colliding ones.
 	chunkFingerprints := map[model.Fingerprint]bool{}
 	for _, c := range store.getChunksForUser(userID) {
-		require.False(t, chunkFingerprints[c.Fingerprint])
-		chunkFingerprints[c.Fingerprint] = true
+		require.False(t, chunkFingerprints[c.FingerprintModel()])
+		chunkFingerprints[c.FingerprintModel()] = true
 	}
 }
 
diff --git a/pkg/logproto/logproto.pb.go b/pkg/logproto/logproto.pb.go
index 0fae805de978b..dfa717e57b0b9 100644
--- a/pkg/logproto/logproto.pb.go
+++ b/pkg/logproto/logproto.pb.go
@@ -14,6 +14,7 @@ import (
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
 	stats "github.com/grafana/loki/pkg/logqlmodel/stats"
+	github_com_prometheus_common_model "github.com/prometheus/common/model"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -1585,6 +1586,73 @@ func (m *GetChunkIDsResponse) GetChunkIDs() []string {
 	return nil
 }
 
+// ChunkRef contains the metadata to reference a Chunk.
+// It is embedded by the Chunk type itself and used to generate the Chunk
+// checksum. So it is imported to take care of the JSON representation of the
+// resulting Go struct.
+type ChunkRef struct {
+	Fingerprint uint64                                  `protobuf:"varint,1,opt,name=fingerprint,proto3" json:"fingerprint"`
+	UserID      string                                  `protobuf:"bytes,2,opt,name=user_id,json=userId,proto3" json:"userID"`
+	From        github_com_prometheus_common_model.Time `protobuf:"varint,3,opt,name=from,proto3,customtype=github.com/prometheus/common/model.Time" json:"from"`
+	Through     github_com_prometheus_common_model.Time `protobuf:"varint,4,opt,name=through,proto3,customtype=github.com/prometheus/common/model.Time" json:"through"`
+	// The checksum is not written to the external storage. We use crc32,
+	// Castagnoli table. See http://www.evanjones.ca/crc32c.html.
+	Checksum uint32 `protobuf:"varint,5,opt,name=checksum,proto3" json:"-"`
+}
+
+func (m *ChunkRef) Reset()      { *m = ChunkRef{} }
+func (*ChunkRef) ProtoMessage() {}
+func (*ChunkRef) Descriptor() ([]byte, []int) {
+	return fileDescriptor_c28a5f14f1f4c79a, []int{29}
+}
+func (m *ChunkRef) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ChunkRef) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ChunkRef.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalToSizedBuffer(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *ChunkRef) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ChunkRef.Merge(m, src)
+}
+func (m *ChunkRef) XXX_Size() int {
+	return m.Size()
+}
+func (m *ChunkRef) XXX_DiscardUnknown() {
+	xxx_messageInfo_ChunkRef.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ChunkRef proto.InternalMessageInfo
+
+func (m *ChunkRef) GetFingerprint() uint64 {
+	if m != nil {
+		return m.Fingerprint
+	}
+	return 0
+}
+
+func (m *ChunkRef) GetUserID() string {
+	if m != nil {
+		return m.UserID
+	}
+	return ""
+}
+
+func (m *ChunkRef) GetChecksum() uint32 {
+	if m != nil {
+		return m.Checksum
+	}
+	return 0
+}
+
 func init() {
 	proto.RegisterEnum("logproto.Direction", Direction_name, Direction_value)
 	proto.RegisterType((*PushRequest)(nil), "logproto.PushRequest")
@@ -1617,107 +1685,117 @@ func init() {
 	proto.RegisterType((*TailersCountResponse)(nil), "logproto.TailersCountResponse")
 	proto.RegisterType((*GetChunkIDsRequest)(nil), "logproto.GetChunkIDsRequest")
 	proto.RegisterType((*GetChunkIDsResponse)(nil), "logproto.GetChunkIDsResponse")
+	proto.RegisterType((*ChunkRef)(nil), "logproto.ChunkRef")
 }
 
 func init() { proto.RegisterFile("pkg/logproto/logproto.proto", fileDescriptor_c28a5f14f1f4c79a) }
 
 var fileDescriptor_c28a5f14f1f4c79a = []byte{
-	// 1520 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4b, 0x6f, 0x53, 0xc7,
-	0x17, 0xf7, 0xf8, 0x71, 0x6d, 0x1f, 0x3b, 0x8e, 0x35, 0x09, 0x89, 0x31, 0x60, 0xfb, 0x7f, 0x85,
-	0xc0, 0xe2, 0xe1, 0xfc, 0xc9, 0xff, 0x51, 0x1e, 0x7d, 0x28, 0x26, 0x05, 0x42, 0xd3, 0x02, 0x37,
-	0x48, 0x48, 0x48, 0x15, 0xba, 0xb1, 0x27, 0xce, 0x55, 0x6c, 0x5f, 0x73, 0x67, 0x8c, 0x14, 0xa9,
-	0x52, 0xfb, 0x01, 0x5a, 0x89, 0xae, 0xaa, 0xee, 0xbb, 0xa8, 0xba, 0xe8, 0xd7, 0x28, 0xdd, 0xb1,
-	0x44, 0x5d, 0xb8, 0x25, 0x6c, 0xaa, 0xa8, 0x0b, 0x3e, 0x41, 0x55, 0xcd, 0xeb, 0xde, 0xb1, 0x49,
-	0x0a, 0x66, 0xd3, 0x8d, 0x3d, 0xe7, 0xcc, 0x79, 0xcd, 0x6f, 0xce, 0x63, 0x6c, 0x38, 0x36, 0xd8,
-	0xe9, 0x2c, 0x75, 0xfd, 0xce, 0x20, 0xf0, 0x99, 0x1f, 0x2e, 0x1a, 0xe2, 0x13, 0x67, 0x34, 0x5d,
-	0xae, 0x76, 0x7c, 0xbf, 0xd3, 0x25, 0x4b, 0x82, 0xda, 0x1c, 0x6e, 0x2d, 0x31, 0xaf, 0x47, 0x28,
-	0x73, 0x7b, 0x03, 0x29, 0x5a, 0x3e, 0xdf, 0xf1, 0xd8, 0xf6, 0x70, 0xb3, 0xd1, 0xf2, 0x7b, 0x4b,
-	0x1d, 0xbf, 0xe3, 0x47, 0x92, 0x9c, 0x92, 0xd6, 0xf9, 0x4a, 0x89, 0xd7, 0x94, 0xdb, 0x87, 0xdd,
-	0x9e, 0xdf, 0x26, 0xdd, 0x25, 0xca, 0x5c, 0x46, 0xe5, 0xa7, 0x94, 0xb0, 0xef, 0x41, 0xee, 0xf6,
-	0x90, 0x6e, 0x3b, 0xe4, 0xe1, 0x90, 0x50, 0x86, 0x6f, 0x40, 0x9a, 0xb2, 0x80, 0xb8, 0x3d, 0x5a,
-	0x42, 0xb5, 0x44, 0x3d, 0xb7, 0xbc, 0xd8, 0x08, 0x83, 0xdd, 0x10, 0x1b, 0x2b, 0x6d, 0x77, 0xc0,
-	0x48, 0xd0, 0x3c, 0xf2, 0xcb, 0xa8, 0x6a, 0x49, 0xd6, 0xfe, 0xa8, 0xaa, 0xb5, 0x1c, 0xbd, 0xb0,
-	0x0b, 0x90, 0x97, 0x86, 0xe9, 0xc0, 0xef, 0x53, 0x62, 0xff, 0x14, 0x87, 0xfc, 0x9d, 0x21, 0x09,
-	0x76, 0xb5, 0xab, 0x32, 0x64, 0x28, 0xe9, 0x92, 0x16, 0xf3, 0x83, 0x12, 0xaa, 0xa1, 0x7a, 0xd6,
-	0x09, 0x69, 0x3c, 0x0f, 0xa9, 0xae, 0xd7, 0xf3, 0x58, 0x29, 0x5e, 0x43, 0xf5, 0x19, 0x47, 0x12,
-	0xf8, 0x32, 0xa4, 0x28, 0x73, 0x03, 0x56, 0x4a, 0xd4, 0x50, 0x3d, 0xb7, 0x5c, 0x6e, 0x48, 0xb4,
-	0x1a, 0x1a, 0x83, 0xc6, 0x5d, 0x8d, 0x56, 0x33, 0xf3, 0x64, 0x54, 0x8d, 0x3d, 0xfe, 0xb5, 0x8a,
-	0x1c, 0xa9, 0x82, 0xff, 0x0f, 0x09, 0xd2, 0x6f, 0x97, 0x92, 0x53, 0x68, 0x72, 0x05, 0x7c, 0x01,
-	0xb2, 0x6d, 0x2f, 0x20, 0x2d, 0xe6, 0xf9, 0xfd, 0x52, 0xaa, 0x86, 0xea, 0x85, 0xe5, 0xb9, 0x08,
-	0x92, 0x55, 0xbd, 0xe5, 0x44, 0x52, 0xf8, 0x1c, 0x58, 0x74, 0xdb, 0x0d, 0xda, 0xb4, 0x94, 0xae,
-	0x25, 0xea, 0xd9, 0xe6, 0xfc, 0xfe, 0xa8, 0x5a, 0x94, 0x9c, 0x73, 0x7e, 0xcf, 0x63, 0xa4, 0x37,
-	0x60, 0xbb, 0x8e, 0x92, 0xc1, 0x67, 0x20, 0xdd, 0x26, 0x5d, 0xc2, 0x08, 0x2d, 0x65, 0x04, 0xe2,
-	0x45, 0xc3, 0xbc, 0xd8, 0x70, 0xb4, 0xc0, 0xcd, 0x64, 0xc6, 0x2a, 0xa6, 0xed, 0x3f, 0x11, 0xe0,
-	0x0d, 0xb7, 0x37, 0xe8, 0x92, 0x37, 0xc6, 0x33, 0x44, 0x2e, 0xfe, 0xd6, 0xc8, 0x25, 0xa6, 0x45,
-	0x2e, 0x82, 0x21, 0x39, 0x1d, 0x0c, 0xa9, 0xd7, 0xc0, 0x60, 0xaf, 0x83, 0x25, 0x59, 0xaf, 0xcb,
-	0xa1, 0xe8, 0xcc, 0x09, 0x7d, 0x9a, 0x62, 0x74, 0x9a, 0x84, 0x88, 0xd3, 0xfe, 0x1c, 0x66, 0x14,
-	0x8e, 0x32, 0x53, 0xf1, 0xca, 0x1b, 0xd7, 0x40, 0xe1, 0xc9, 0xa8, 0x8a, 0xa2, 0x3a, 0x08, 0x93,
-	0x1f, 0x9f, 0x15, 0xbe, 0x19, 0x55, 0x78, 0xcf, 0x36, 0x64, 0xc9, 0xad, 0xf5, 0x3b, 0x84, 0x72,
-	0xc5, 0x24, 0x87, 0xca, 0x91, 0x32, 0xf6, 0x67, 0x30, 0x37, 0x76, 0x9d, 0x2a, 0x8c, 0x8b, 0x60,
-	0x51, 0x12, 0x78, 0x44, 0x47, 0x61, 0x00, 0xb2, 0x21, 0xf8, 0x86, 0x7b, 0x41, 0x3b, 0x4a, 0x7e,
-	0x3a, 0xef, 0x3f, 0x22, 0xc8, 0xaf, 0xbb, 0x9b, 0xa4, 0xab, 0xf3, 0x08, 0x43, 0xb2, 0xef, 0xf6,
-	0x88, 0xc2, 0x53, 0xac, 0xf1, 0x02, 0x58, 0x8f, 0xdc, 0xee, 0x90, 0x48, 0x93, 0x19, 0x47, 0x51,
-	0xd3, 0x56, 0x24, 0x7a, 0xeb, 0x8a, 0x44, 0x61, 0x5e, 0xd9, 0xa7, 0x61, 0x46, 0xc5, 0xab, 0x80,
-	0x8a, 0x82, 0xe3, 0x40, 0x65, 0x75, 0x70, 0xf6, 0xd7, 0x08, 0x66, 0xc6, 0xee, 0x0b, 0xdb, 0x60,
-	0x75, 0xb9, 0x2a, 0x95, 0x87, 0x6b, 0xc2, 0xfe, 0xa8, 0xaa, 0x38, 0x8e, 0xfa, 0xe6, 0xb7, 0x4f,
-	0xfa, 0x4c, 0xe0, 0x1e, 0x17, 0xb8, 0x2f, 0x44, 0xb8, 0x7f, 0xd8, 0x67, 0xc1, 0xae, 0xbe, 0xfc,
-	0x59, 0x8e, 0x22, 0x6f, 0x7d, 0x4a, 0xdc, 0xd1, 0x0b, 0x7c, 0x14, 0x92, 0xdb, 0x2e, 0xdd, 0x16,
-	0xa0, 0x24, 0x9b, 0xa9, 0xfd, 0x51, 0x15, 0x9d, 0x77, 0x04, 0xcb, 0x7e, 0x04, 0x79, 0xd3, 0x08,
-	0xbe, 0x01, 0xd9, 0xb0, 0xc5, 0x8b, 0xa0, 0xfe, 0x1e, 0x8a, 0x82, 0xf2, 0x19, 0x67, 0x54, 0x00,
-	0x12, 0x29, 0xe3, 0xe3, 0x90, 0xec, 0x7a, 0x7d, 0x22, 0x2e, 0x28, 0xdb, 0xcc, 0xec, 0x8f, 0xaa,
-	0x82, 0x76, 0xc4, 0xa7, 0xdd, 0x03, 0x4b, 0xe6, 0x18, 0x3e, 0x39, 0xe9, 0x31, 0xd1, 0xb4, 0xa4,
-	0x45, 0xd3, 0x5a, 0x15, 0x52, 0x02, 0x45, 0x61, 0x0e, 0x35, 0xb3, 0xfb, 0xa3, 0xaa, 0x64, 0x38,
-	0xf2, 0x8b, 0xbb, 0x33, 0xce, 0x28, 0xdc, 0x71, 0x5a, 0x1d, 0xf3, 0x3a, 0xe4, 0xd7, 0x49, 0xc7,
-	0x6d, 0xed, 0x2a, 0xa7, 0xf3, 0xda, 0x1c, 0x77, 0x88, 0xb4, 0x8d, 0x7f, 0x41, 0x3e, 0xf4, 0xf8,
-	0xa0, 0x47, 0x55, 0xa1, 0xe6, 0x42, 0xde, 0xc7, 0xd4, 0xfe, 0x16, 0x81, 0xca, 0xee, 0x37, 0xba,
-	0xbc, 0x2b, 0x90, 0xa6, 0xc2, 0xa3, 0xbe, 0x3c, 0xb3, 0x68, 0xc4, 0x46, 0x74, 0x6d, 0x4a, 0xd0,
-	0xd1, 0x0b, 0xdc, 0x00, 0x90, 0xf5, 0x7b, 0x23, 0x3a, 0x58, 0x61, 0x7f, 0x54, 0x35, 0xb8, 0x8e,
-	0xb1, 0xb6, 0xbf, 0x41, 0x90, 0xbb, 0xeb, 0x7a, 0x61, 0xe1, 0xcc, 0x43, 0xea, 0x21, 0xaf, 0x60,
-	0x55, 0x39, 0x92, 0xe0, 0x2d, 0xaa, 0x4d, 0xba, 0xee, 0xee, 0x35, 0x3f, 0x10, 0x36, 0x67, 0x9c,
-	0x90, 0x8e, 0xc6, 0x5c, 0xf2, 0xc0, 0x31, 0x97, 0x9a, 0xba, 0x59, 0xdf, 0x4c, 0x66, 0xe2, 0xc5,
-	0x84, 0xfd, 0x25, 0x82, 0xbc, 0x8c, 0x4c, 0x95, 0xc8, 0x15, 0xb0, 0x64, 0xe0, 0x2a, 0xc7, 0x0e,
-	0xed, 0x68, 0x60, 0x74, 0x33, 0xa5, 0x82, 0x3f, 0x80, 0x42, 0x3b, 0xf0, 0x07, 0x03, 0xd2, 0xde,
-	0x50, 0x6d, 0x31, 0x3e, 0xd9, 0x16, 0x57, 0xcd, 0x7d, 0x67, 0x42, 0xdc, 0xfe, 0x99, 0x17, 0xa2,
-	0x6c, 0x51, 0x0a, 0xaa, 0xf0, 0x88, 0xe8, 0xad, 0xe7, 0x51, 0x7c, 0xda, 0x79, 0xb4, 0x00, 0x56,
-	0x27, 0xf0, 0x87, 0x03, 0x5a, 0x4a, 0xc8, 0x36, 0x21, 0xa9, 0xe9, 0xe6, 0x94, 0x7d, 0x13, 0x0a,
-	0xfa, 0x28, 0x87, 0xf4, 0xe9, 0xf2, 0x64, 0x9f, 0x5e, 0x6b, 0x93, 0x3e, 0xf3, 0xb6, 0xbc, 0xb0,
-	0xf3, 0x2a, 0x79, 0xfb, 0x2b, 0x04, 0xc5, 0x49, 0x11, 0xfc, 0xbe, 0x91, 0xe6, 0xdc, 0xdc, 0xa9,
-	0xc3, 0xcd, 0x35, 0x44, 0x1f, 0xa4, 0xa2, 0xa1, 0xe8, 0x12, 0x28, 0x5f, 0x82, 0x9c, 0xc1, 0xe6,
-	0xf3, 0x6e, 0x87, 0xe8, 0x94, 0xe4, 0xcb, 0xa8, 0x16, 0xe3, 0x32, 0x4d, 0x05, 0x71, 0x39, 0x7e,
-	0x11, 0xf1, 0x84, 0x9e, 0x19, 0xbb, 0x49, 0x7c, 0x11, 0x92, 0x5b, 0x81, 0xdf, 0x9b, 0xea, 0x9a,
-	0x84, 0x06, 0xfe, 0x2f, 0xc4, 0x99, 0x3f, 0xd5, 0x25, 0xc5, 0x99, 0xcf, 0xef, 0x48, 0x1d, 0x3e,
-	0x21, 0x82, 0x53, 0x94, 0xfd, 0x03, 0x82, 0x59, 0xae, 0x23, 0x11, 0xb8, 0xba, 0x3d, 0xec, 0xef,
-	0xe0, 0x3a, 0x14, 0xb9, 0xa7, 0x07, 0x9e, 0x1a, 0x6b, 0x0f, 0xbc, 0xb6, 0x3a, 0x66, 0x81, 0xf3,
-	0xf5, 0xb4, 0x5b, 0x6b, 0xe3, 0x45, 0x48, 0x0f, 0xa9, 0x14, 0x90, 0x67, 0xb6, 0x38, 0xb9, 0xd6,
-	0xc6, 0x67, 0x0d, 0x77, 0x1c, 0x6b, 0xe3, 0x65, 0x27, 0x30, 0xbc, 0xed, 0x7a, 0x41, 0xd8, 0x5b,
-	0x4e, 0x83, 0xd5, 0xe2, 0x8e, 0x65, 0x9e, 0xf0, 0xb1, 0x1a, 0x0a, 0x8b, 0x80, 0x1c, 0xb5, 0x6d,
-	0xff, 0x0f, 0xb2, 0xa1, 0xf6, 0x81, 0xd3, 0xf4, 0xc0, 0x1b, 0xb0, 0xaf, 0xc0, 0xac, 0xec, 0x99,
-	0x07, 0x2b, 0xe7, 0x0f, 0x52, 0xce, 0x6b, 0xe5, 0x63, 0x90, 0x92, 0xa8, 0x60, 0x48, 0xb6, 0x5d,
-	0xe6, 0x6a, 0x15, 0xbe, 0xb6, 0x4b, 0xb0, 0x70, 0x37, 0x70, 0xfb, 0x74, 0x8b, 0x04, 0x42, 0x28,
-	0xcc, 0x5d, 0xfb, 0x08, 0xcc, 0xf1, 0x3e, 0x41, 0x02, 0x7a, 0xd5, 0x1f, 0xf6, 0x99, 0x2a, 0x4f,
-	0xfb, 0x1c, 0xcc, 0x8f, 0xb3, 0x55, 0xaa, 0xcf, 0x43, 0xaa, 0xc5, 0x19, 0xc2, 0xfa, 0x8c, 0x23,
-	0x09, 0xfb, 0x3b, 0x04, 0xf8, 0x3a, 0x61, 0xc2, 0xf4, 0xda, 0x2a, 0x35, 0xde, 0xa3, 0x3d, 0x97,
-	0xb5, 0xb6, 0x49, 0x40, 0xf5, 0xdb, 0x4c, 0xd3, 0xff, 0xc4, 0x7b, 0xd4, 0xbe, 0x00, 0x73, 0x63,
-	0x51, 0xaa, 0x33, 0x95, 0x21, 0xd3, 0x52, 0x3c, 0xf5, 0x7e, 0x08, 0xe9, 0x33, 0xa7, 0x20, 0x1b,
-	0xbe, 0xf0, 0x71, 0x0e, 0xd2, 0xd7, 0x6e, 0x39, 0xf7, 0x56, 0x9c, 0xd5, 0x62, 0x0c, 0xe7, 0x21,
-	0xd3, 0x5c, 0xb9, 0xfa, 0x91, 0xa0, 0xd0, 0xf2, 0x0a, 0x58, 0xfc, 0xb7, 0x0e, 0x09, 0xf0, 0x3b,
-	0x90, 0xe4, 0x2b, 0x7c, 0x24, 0x4a, 0x0e, 0xe3, 0xe7, 0x55, 0x79, 0x61, 0x92, 0xad, 0xee, 0x21,
-	0xb6, 0xfc, 0x47, 0x02, 0xd2, 0xfc, 0xfd, 0xc7, 0x5b, 0xc0, 0xbb, 0x90, 0x12, 0x4f, 0x41, 0x6c,
-	0x88, 0x9b, 0x4f, 0xfd, 0xf2, 0xe2, 0x2b, 0x7c, 0x6d, 0xe7, 0xdf, 0x08, 0x7f, 0x02, 0x39, 0xc1,
-	0x54, 0xa3, 0xf7, 0xf8, 0xe4, 0x04, 0x1c, 0xb3, 0x74, 0xe2, 0x90, 0x5d, 0xc3, 0xde, 0x65, 0x48,
-	0x89, 0x8c, 0x34, 0xa3, 0x31, 0x1f, 0x8c, 0x66, 0x34, 0x63, 0x0f, 0x33, 0x3b, 0x86, 0x2f, 0x41,
-	0x92, 0x27, 0x92, 0x09, 0x87, 0x31, 0x31, 0x4d, 0x38, 0xcc, 0x71, 0x25, 0xdc, 0xbe, 0x17, 0x0e,
-	0xfe, 0xc5, 0xc9, 0x0e, 0xa8, 0xd5, 0x4b, 0xaf, 0x6e, 0x84, 0x9e, 0x6f, 0xc9, 0x09, 0xa8, 0x53,
-	0x18, 0x9f, 0x18, 0x77, 0x35, 0x91, 0xf1, 0xe5, 0xca, 0x61, 0xdb, 0xa1, 0xc1, 0x75, 0xc8, 0x19,
-	0xe9, 0x63, 0xc2, 0xfa, 0x6a, 0xee, 0x9b, 0xb0, 0x1e, 0x90, 0x73, 0x76, 0x6c, 0xf9, 0x53, 0xc8,
-	0xe8, 0x06, 0x85, 0xef, 0x40, 0x61, 0xbc, 0x3c, 0xf1, 0x51, 0x23, 0x9a, 0xf1, 0xae, 0x57, 0xae,
-	0x19, 0x5b, 0x07, 0xd7, 0x74, 0xac, 0x8e, 0x9a, 0xf7, 0x9f, 0x3e, 0xaf, 0xc4, 0x9e, 0x3d, 0xaf,
-	0xc4, 0x5e, 0x3e, 0xaf, 0xa0, 0x2f, 0xf6, 0x2a, 0xe8, 0xfb, 0xbd, 0x0a, 0x7a, 0xb2, 0x57, 0x41,
-	0x4f, 0xf7, 0x2a, 0xe8, 0xb7, 0xbd, 0x0a, 0xfa, 0x7d, 0xaf, 0x12, 0x7b, 0xb9, 0x57, 0x41, 0x8f,
-	0x5f, 0x54, 0x62, 0x4f, 0x5f, 0x54, 0x62, 0xcf, 0x5e, 0x54, 0x62, 0xf7, 0x4f, 0x9a, 0x7f, 0x2e,
-	0x04, 0xee, 0x96, 0xdb, 0x77, 0x97, 0xba, 0xfe, 0x8e, 0xb7, 0x64, 0xfe, 0x79, 0xb1, 0x69, 0x89,
-	0xaf, 0xff, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0xce, 0xd4, 0x16, 0x65, 0xd3, 0x10, 0x00, 0x00,
+	// 1654 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x49, 0x6f, 0x1b, 0xc9,
+	0x15, 0x66, 0x71, 0x69, 0x92, 0x8f, 0x8b, 0x88, 0x92, 0x2c, 0x71, 0x38, 0x33, 0x6c, 0x4e, 0x63,
+	0x30, 0x26, 0xbc, 0x90, 0xb1, 0xb2, 0xd8, 0x96, 0xb3, 0x40, 0xb4, 0x62, 0x5b, 0xb6, 0x12, 0xdb,
+	0x2d, 0x05, 0x06, 0x0c, 0x04, 0x46, 0x8b, 0x2c, 0x91, 0x0d, 0xb1, 0xd9, 0x74, 0x57, 0xd3, 0x80,
+	0x80, 0x00, 0xc9, 0x0f, 0x48, 0x00, 0xe7, 0x14, 0xe4, 0x9e, 0x43, 0x90, 0x43, 0x0e, 0xf9, 0x13,
+	0x71, 0x6e, 0x3e, 0x1a, 0x3e, 0x30, 0x31, 0x7d, 0x09, 0x88, 0x1c, 0xfc, 0x0b, 0x82, 0xa0, 0xb6,
+	0x66, 0x91, 0x96, 0x62, 0xd3, 0x97, 0xb9, 0x88, 0xf5, 0x5e, 0xbd, 0xad, 0xbe, 0x7a, 0x4b, 0xb5,
+	0xe0, 0xf3, 0xe1, 0x71, 0xb7, 0xd9, 0xf7, 0xbb, 0xc3, 0xc0, 0x0f, 0xfd, 0x68, 0xd1, 0xe0, 0x7f,
+	0x71, 0x46, 0xd1, 0x15, 0xb3, 0xeb, 0xfb, 0xdd, 0x3e, 0x69, 0x72, 0xea, 0x70, 0x74, 0xd4, 0x0c,
+	0x5d, 0x8f, 0xd0, 0xd0, 0xf1, 0x86, 0x42, 0xb4, 0x72, 0xb9, 0xeb, 0x86, 0xbd, 0xd1, 0x61, 0xa3,
+	0xed, 0x7b, 0xcd, 0xae, 0xdf, 0xf5, 0x67, 0x92, 0x8c, 0x12, 0xd6, 0xd9, 0x4a, 0x8a, 0xd7, 0xa4,
+	0xdb, 0xa7, 0x7d, 0xcf, 0xef, 0x90, 0x7e, 0x93, 0x86, 0x4e, 0x48, 0xc5, 0x5f, 0x21, 0x61, 0x3d,
+	0x82, 0xdc, 0x83, 0x11, 0xed, 0xd9, 0xe4, 0xe9, 0x88, 0xd0, 0x10, 0xdf, 0x81, 0x34, 0x0d, 0x03,
+	0xe2, 0x78, 0xb4, 0x8c, 0x6a, 0x89, 0x7a, 0x6e, 0x73, 0xa3, 0x11, 0x05, 0xbb, 0xcf, 0x37, 0xb6,
+	0x3b, 0xce, 0x30, 0x24, 0x41, 0xeb, 0xdc, 0xeb, 0xb1, 0x69, 0x08, 0xd6, 0x74, 0x6c, 0x2a, 0x2d,
+	0x5b, 0x2d, 0xac, 0x22, 0xe4, 0x85, 0x61, 0x3a, 0xf4, 0x07, 0x94, 0x58, 0x7f, 0x8f, 0x43, 0xfe,
+	0xe1, 0x88, 0x04, 0x27, 0xca, 0x55, 0x05, 0x32, 0x94, 0xf4, 0x49, 0x3b, 0xf4, 0x83, 0x32, 0xaa,
+	0xa1, 0x7a, 0xd6, 0x8e, 0x68, 0xbc, 0x06, 0xa9, 0xbe, 0xeb, 0xb9, 0x61, 0x39, 0x5e, 0x43, 0xf5,
+	0x82, 0x2d, 0x08, 0xbc, 0x05, 0x29, 0x1a, 0x3a, 0x41, 0x58, 0x4e, 0xd4, 0x50, 0x3d, 0xb7, 0x59,
+	0x69, 0x08, 0xb4, 0x1a, 0x0a, 0x83, 0xc6, 0x81, 0x42, 0xab, 0x95, 0x79, 0x31, 0x36, 0x63, 0xcf,
+	0xff, 0x69, 0x22, 0x5b, 0xa8, 0xe0, 0x1f, 0x40, 0x82, 0x0c, 0x3a, 0xe5, 0xe4, 0x12, 0x9a, 0x4c,
+	0x01, 0x5f, 0x81, 0x6c, 0xc7, 0x0d, 0x48, 0x3b, 0x74, 0xfd, 0x41, 0x39, 0x55, 0x43, 0xf5, 0xe2,
+	0xe6, 0xea, 0x0c, 0x92, 0x1d, 0xb5, 0x65, 0xcf, 0xa4, 0xf0, 0x25, 0x30, 0x68, 0xcf, 0x09, 0x3a,
+	0xb4, 0x9c, 0xae, 0x25, 0xea, 0xd9, 0xd6, 0xda, 0x74, 0x6c, 0x96, 0x04, 0xe7, 0x92, 0xef, 0xb9,
+	0x21, 0xf1, 0x86, 0xe1, 0x89, 0x2d, 0x65, 0xf0, 0x05, 0x48, 0x77, 0x48, 0x9f, 0x84, 0x84, 0x96,
+	0x33, 0x1c, 0xf1, 0x92, 0x66, 0x9e, 0x6f, 0xd8, 0x4a, 0xe0, 0x6e, 0x32, 0x63, 0x94, 0xd2, 0xd6,
+	0x7f, 0x11, 0xe0, 0x7d, 0xc7, 0x1b, 0xf6, 0xc9, 0x47, 0xe3, 0x19, 0x21, 0x17, 0xff, 0x64, 0xe4,
+	0x12, 0xcb, 0x22, 0x37, 0x83, 0x21, 0xb9, 0x1c, 0x0c, 0xa9, 0x0f, 0xc0, 0x60, 0xed, 0x81, 0x21,
+	0x58, 0x1f, 0xca, 0xa1, 0xd9, 0x99, 0x13, 0xea, 0x34, 0xa5, 0xd9, 0x69, 0x12, 0x3c, 0x4e, 0xeb,
+	0xd7, 0x50, 0x90, 0x38, 0x8a, 0x4c, 0xc5, 0xdb, 0x1f, 0x5d, 0x03, 0xc5, 0x17, 0x63, 0x13, 0xcd,
+	0xea, 0x20, 0x4a, 0x7e, 0x7c, 0x91, 0xfb, 0x0e, 0xa9, 0xc4, 0x7b, 0xa5, 0x21, 0x4a, 0x6e, 0x77,
+	0xd0, 0x25, 0x94, 0x29, 0x26, 0x19, 0x54, 0xb6, 0x90, 0xb1, 0x7e, 0x05, 0xab, 0x73, 0xd7, 0x29,
+	0xc3, 0xb8, 0x06, 0x06, 0x25, 0x81, 0x4b, 0x54, 0x14, 0x1a, 0x20, 0xfb, 0x9c, 0xaf, 0xb9, 0xe7,
+	0xb4, 0x2d, 0xe5, 0x97, 0xf3, 0xfe, 0x57, 0x04, 0xf9, 0x3d, 0xe7, 0x90, 0xf4, 0x55, 0x1e, 0x61,
+	0x48, 0x0e, 0x1c, 0x8f, 0x48, 0x3c, 0xf9, 0x1a, 0xaf, 0x83, 0xf1, 0xcc, 0xe9, 0x8f, 0x88, 0x30,
+	0x99, 0xb1, 0x25, 0xb5, 0x6c, 0x45, 0xa2, 0x4f, 0xae, 0x48, 0x14, 0xe5, 0x95, 0x75, 0x1e, 0x0a,
+	0x32, 0x5e, 0x09, 0xd4, 0x2c, 0x38, 0x06, 0x54, 0x56, 0x05, 0x67, 0xfd, 0x1e, 0x41, 0x61, 0xee,
+	0xbe, 0xb0, 0x05, 0x46, 0x9f, 0xa9, 0x52, 0x71, 0xb8, 0x16, 0x4c, 0xc7, 0xa6, 0xe4, 0xd8, 0xf2,
+	0x97, 0xdd, 0x3e, 0x19, 0x84, 0x1c, 0xf7, 0x38, 0xc7, 0x7d, 0x7d, 0x86, 0xfb, 0x4f, 0x07, 0x61,
+	0x70, 0xa2, 0x2e, 0x7f, 0x85, 0xa1, 0xc8, 0x5a, 0x9f, 0x14, 0xb7, 0xd5, 0x02, 0x7f, 0x06, 0xc9,
+	0x9e, 0x43, 0x7b, 0x1c, 0x94, 0x64, 0x2b, 0x35, 0x1d, 0x9b, 0xe8, 0xb2, 0xcd, 0x59, 0xd6, 0x33,
+	0xc8, 0xeb, 0x46, 0xf0, 0x1d, 0xc8, 0x46, 0x2d, 0x9e, 0x07, 0xf5, 0xff, 0xa1, 0x28, 0x4a, 0x9f,
+	0xf1, 0x90, 0x72, 0x40, 0x66, 0xca, 0xf8, 0x0b, 0x48, 0xf6, 0xdd, 0x01, 0xe1, 0x17, 0x94, 0x6d,
+	0x65, 0xa6, 0x63, 0x93, 0xd3, 0x36, 0xff, 0x6b, 0x79, 0x60, 0x88, 0x1c, 0xc3, 0x5f, 0x2f, 0x7a,
+	0x4c, 0xb4, 0x0c, 0x61, 0x51, 0xb7, 0x66, 0x42, 0x8a, 0xa3, 0xc8, 0xcd, 0xa1, 0x56, 0x76, 0x3a,
+	0x36, 0x05, 0xc3, 0x16, 0x3f, 0xcc, 0x9d, 0x76, 0x46, 0xee, 0x8e, 0xd1, 0xf2, 0x98, 0xb7, 0x21,
+	0xbf, 0x47, 0xba, 0x4e, 0xfb, 0x44, 0x3a, 0x5d, 0x53, 0xe6, 0x98, 0x43, 0xa4, 0x6c, 0x7c, 0x05,
+	0xf9, 0xc8, 0xe3, 0x13, 0x8f, 0xca, 0x42, 0xcd, 0x45, 0xbc, 0x9f, 0x51, 0xeb, 0x8f, 0x08, 0x64,
+	0x76, 0x7f, 0xd4, 0xe5, 0xdd, 0x80, 0x34, 0xe5, 0x1e, 0xd5, 0xe5, 0xe9, 0x45, 0xc3, 0x37, 0x66,
+	0xd7, 0x26, 0x05, 0x6d, 0xb5, 0xc0, 0x0d, 0x00, 0x51, 0xbf, 0x77, 0x66, 0x07, 0x2b, 0x4e, 0xc7,
+	0xa6, 0xc6, 0xb5, 0xb5, 0xb5, 0xf5, 0x07, 0x04, 0xb9, 0x03, 0xc7, 0x8d, 0x0a, 0x67, 0x0d, 0x52,
+	0x4f, 0x59, 0x05, 0xcb, 0xca, 0x11, 0x04, 0x6b, 0x51, 0x1d, 0xd2, 0x77, 0x4e, 0x6e, 0xf9, 0x01,
+	0xb7, 0x59, 0xb0, 0x23, 0x7a, 0x36, 0xe6, 0x92, 0xa7, 0x8e, 0xb9, 0xd4, 0xd2, 0xcd, 0xfa, 0x6e,
+	0x32, 0x13, 0x2f, 0x25, 0xac, 0xdf, 0x22, 0xc8, 0x8b, 0xc8, 0x64, 0x89, 0xdc, 0x00, 0x43, 0x04,
+	0x2e, 0x73, 0xec, 0xcc, 0x8e, 0x06, 0x5a, 0x37, 0x93, 0x2a, 0xf8, 0x27, 0x50, 0xec, 0x04, 0xfe,
+	0x70, 0x48, 0x3a, 0xfb, 0xb2, 0x2d, 0xc6, 0x17, 0xdb, 0xe2, 0x8e, 0xbe, 0x6f, 0x2f, 0x88, 0x5b,
+	0xff, 0x60, 0x85, 0x28, 0x5a, 0x94, 0x84, 0x2a, 0x3a, 0x22, 0xfa, 0xe4, 0x79, 0x14, 0x5f, 0x76,
+	0x1e, 0xad, 0x83, 0xd1, 0x0d, 0xfc, 0xd1, 0x90, 0x96, 0x13, 0xa2, 0x4d, 0x08, 0x6a, 0xb9, 0x39,
+	0x65, 0xdd, 0x85, 0xa2, 0x3a, 0xca, 0x19, 0x7d, 0xba, 0xb2, 0xd8, 0xa7, 0x77, 0x3b, 0x64, 0x10,
+	0xba, 0x47, 0x6e, 0xd4, 0x79, 0xa5, 0xbc, 0xf5, 0x3b, 0x04, 0xa5, 0x45, 0x11, 0xfc, 0x63, 0x2d,
+	0xcd, 0x99, 0xb9, 0x6f, 0xce, 0x36, 0xd7, 0xe0, 0x7d, 0x90, 0xf2, 0x86, 0xa2, 0x4a, 0xa0, 0x72,
+	0x1d, 0x72, 0x1a, 0x9b, 0xcd, 0xbb, 0x63, 0xa2, 0x52, 0x92, 0x2d, 0x67, 0xb5, 0x18, 0x17, 0x69,
+	0xca, 0x89, 0xad, 0xf8, 0x35, 0xc4, 0x12, 0xba, 0x30, 0x77, 0x93, 0xf8, 0x1a, 0x24, 0x8f, 0x02,
+	0xdf, 0x5b, 0xea, 0x9a, 0xb8, 0x06, 0xfe, 0x1e, 0xc4, 0x43, 0x7f, 0xa9, 0x4b, 0x8a, 0x87, 0x3e,
+	0xbb, 0x23, 0x79, 0xf8, 0x04, 0x0f, 0x4e, 0x52, 0xd6, 0x5f, 0x10, 0xac, 0x30, 0x1d, 0x81, 0xc0,
+	0xcd, 0xde, 0x68, 0x70, 0x8c, 0xeb, 0x50, 0x62, 0x9e, 0x9e, 0xb8, 0x72, 0xac, 0x3d, 0x71, 0x3b,
+	0xf2, 0x98, 0x45, 0xc6, 0x57, 0xd3, 0x6e, 0xb7, 0x83, 0x37, 0x20, 0x3d, 0xa2, 0x42, 0x40, 0x9c,
+	0xd9, 0x60, 0xe4, 0x6e, 0x07, 0x5f, 0xd4, 0xdc, 0x31, 0xac, 0xb5, 0x97, 0x1d, 0xc7, 0xf0, 0x81,
+	0xe3, 0x06, 0x51, 0x6f, 0x39, 0x0f, 0x46, 0x9b, 0x39, 0x16, 0x79, 0xc2, 0xc6, 0x6a, 0x24, 0xcc,
+	0x03, 0xb2, 0xe5, 0xb6, 0xf5, 0x7d, 0xc8, 0x46, 0xda, 0xa7, 0x4e, 0xd3, 0x53, 0x6f, 0xc0, 0xba,
+	0x01, 0x2b, 0xa2, 0x67, 0x9e, 0xae, 0x9c, 0x3f, 0x4d, 0x39, 0xaf, 0x94, 0x3f, 0x87, 0x94, 0x40,
+	0x05, 0x43, 0xb2, 0xe3, 0x84, 0x8e, 0x52, 0x61, 0x6b, 0xab, 0x0c, 0xeb, 0x07, 0x81, 0x33, 0xa0,
+	0x47, 0x24, 0xe0, 0x42, 0x51, 0xee, 0x5a, 0xe7, 0x60, 0x95, 0xf5, 0x09, 0x12, 0xd0, 0x9b, 0xfe,
+	0x68, 0x10, 0xca, 0xf2, 0xb4, 0x2e, 0xc1, 0xda, 0x3c, 0x5b, 0xa6, 0xfa, 0x1a, 0xa4, 0xda, 0x8c,
+	0xc1, 0xad, 0x17, 0x6c, 0x41, 0x58, 0x7f, 0x42, 0x80, 0x6f, 0x93, 0x90, 0x9b, 0xde, 0xdd, 0xa1,
+	0xda, 0x7b, 0xd4, 0x73, 0xc2, 0x76, 0x8f, 0x04, 0x54, 0xbd, 0xcd, 0x14, 0xfd, 0x6d, 0xbc, 0x47,
+	0xad, 0x2b, 0xb0, 0x3a, 0x17, 0xa5, 0x3c, 0x53, 0x05, 0x32, 0x6d, 0xc9, 0x93, 0xef, 0x87, 0x88,
+	0xb6, 0xfe, 0x16, 0x87, 0x8c, 0xb8, 0x5b, 0x72, 0x84, 0xaf, 0x40, 0xee, 0x88, 0xe5, 0x5a, 0x30,
+	0x0c, 0x5c, 0x09, 0x41, 0xb2, 0xb5, 0x32, 0x1d, 0x9b, 0x3a, 0xdb, 0xd6, 0x09, 0x7c, 0x79, 0x21,
+	0xf1, 0x5a, 0x6b, 0x93, 0xb1, 0x69, 0xfc, 0x82, 0x25, 0xdf, 0x0e, 0x9b, 0x5e, 0x3c, 0x0d, 0x77,
+	0xa2, 0x74, 0xbc, 0x27, 0xab, 0x8d, 0x3f, 0x4e, 0x5b, 0x57, 0x59, 0xf8, 0xaf, 0xc7, 0xe6, 0x79,
+	0xed, 0x93, 0x6f, 0x18, 0xf8, 0x1e, 0x09, 0x7b, 0x64, 0x44, 0x9b, 0x6d, 0xdf, 0xf3, 0xfc, 0x41,
+	0x93, 0x7f, 0xd7, 0xf1, 0x43, 0xb3, 0x11, 0xcc, 0xd4, 0x65, 0x01, 0x1e, 0x40, 0x3a, 0xec, 0x05,
+	0xfe, 0xa8, 0xdb, 0xe3, 0xd3, 0x25, 0xd1, 0xda, 0x5a, 0xde, 0x9e, 0xb2, 0x60, 0xab, 0x05, 0xfe,
+	0x8a, 0xa1, 0x45, 0xda, 0xc7, 0x74, 0xe4, 0xf1, 0xf1, 0x54, 0x50, 0xcf, 0x9b, 0x88, 0x7d, 0xe1,
+	0x1b, 0xc8, 0x46, 0x9f, 0x45, 0x38, 0x07, 0xe9, 0x5b, 0xf7, 0xed, 0x47, 0xdb, 0xf6, 0x4e, 0x29,
+	0x86, 0xf3, 0x90, 0x69, 0x6d, 0xdf, 0xbc, 0xc7, 0x29, 0xb4, 0xb9, 0x0d, 0x06, 0xfb, 0x40, 0x24,
+	0x01, 0xbe, 0x0a, 0x49, 0xb6, 0xc2, 0xe7, 0x66, 0x15, 0xa5, 0x7d, 0x93, 0x56, 0xd6, 0x17, 0xd9,
+	0x32, 0x79, 0x63, 0x9b, 0xff, 0x49, 0x40, 0x9a, 0x3d, 0x9a, 0x59, 0xdf, 0xfc, 0x21, 0xa4, 0xf8,
+	0xfb, 0x19, 0x6b, 0xe2, 0xfa, 0xf7, 0x51, 0x65, 0xe3, 0x3d, 0xbe, 0xb2, 0xf3, 0x1d, 0x84, 0x7f,
+	0x0e, 0x39, 0xce, 0x94, 0xef, 0x95, 0x2f, 0x16, 0x9f, 0x0d, 0x73, 0x96, 0xbe, 0x3c, 0x63, 0x57,
+	0xb3, 0xb7, 0x05, 0x29, 0x5e, 0xc6, 0x7a, 0x34, 0xfa, 0x2b, 0x5b, 0x8f, 0x66, 0xee, 0x35, 0x6b,
+	0xc5, 0xf0, 0x75, 0x48, 0xb2, 0xea, 0xd3, 0xe1, 0xd0, 0x9e, 0x19, 0x3a, 0x1c, 0xfa, 0x8c, 0xe7,
+	0x6e, 0x7f, 0x14, 0xbd, 0x96, 0x36, 0x16, 0xc7, 0x86, 0x52, 0x2f, 0xbf, 0xbf, 0x11, 0x79, 0xbe,
+	0x2f, 0x9e, 0x0d, 0xaa, 0xee, 0xf1, 0x97, 0xf3, 0xae, 0x16, 0xda, 0x44, 0xa5, 0x7a, 0xd6, 0x76,
+	0x64, 0x70, 0x0f, 0x72, 0x5a, 0xcd, 0xe9, 0xb0, 0xbe, 0xdf, 0x30, 0x74, 0x58, 0x4f, 0x29, 0x54,
+	0x2b, 0xb6, 0xf9, 0x4b, 0xc8, 0xa8, 0xae, 0x8e, 0x1f, 0x42, 0x71, 0xbe, 0xa7, 0xe1, 0xcf, 0xb4,
+	0x68, 0xe6, 0x47, 0x45, 0xa5, 0xa6, 0x6d, 0x9d, 0xde, 0x08, 0x63, 0x75, 0xd4, 0x7a, 0xfc, 0xf2,
+	0x4d, 0x35, 0xf6, 0xea, 0x4d, 0x35, 0xf6, 0xee, 0x4d, 0x15, 0xfd, 0x66, 0x52, 0x45, 0x7f, 0x9e,
+	0x54, 0xd1, 0x8b, 0x49, 0x15, 0xbd, 0x9c, 0x54, 0xd1, 0xbf, 0x26, 0x55, 0xf4, 0xef, 0x49, 0x35,
+	0xf6, 0x6e, 0x52, 0x45, 0xcf, 0xdf, 0x56, 0x63, 0x2f, 0xdf, 0x56, 0x63, 0xaf, 0xde, 0x56, 0x63,
+	0x8f, 0xbf, 0xd6, 0xff, 0x23, 0x13, 0x38, 0x47, 0xce, 0xc0, 0x69, 0xf6, 0xfd, 0x63, 0xb7, 0xa9,
+	0xff, 0xc7, 0xe7, 0xd0, 0xe0, 0x3f, 0xdf, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xf9,
+	0x78, 0x9a, 0x08, 0x12, 0x00, 0x00,
 }
 
 func (x Direction) String() string {
@@ -2639,6 +2717,42 @@ func (this *GetChunkIDsResponse) Equal(that interface{}) bool {
 	}
 	return true
 }
+func (this *ChunkRef) Equal(that interface{}) bool {
+	if that == nil {
+		return this == nil
+	}
+
+	that1, ok := that.(*ChunkRef)
+	if !ok {
+		that2, ok := that.(ChunkRef)
+		if ok {
+			that1 = &that2
+		} else {
+			return false
+		}
+	}
+	if that1 == nil {
+		return this == nil
+	} else if this == nil {
+		return false
+	}
+	if this.Fingerprint != that1.Fingerprint {
+		return false
+	}
+	if this.UserID != that1.UserID {
+		return false
+	}
+	if !this.From.Equal(that1.From) {
+		return false
+	}
+	if !this.Through.Equal(that1.Through) {
+		return false
+	}
+	if this.Checksum != that1.Checksum {
+		return false
+	}
+	return true
+}
 func (this *PushRequest) GoString() string {
 	if this == nil {
 		return "nil"
@@ -3007,6 +3121,20 @@ func (this *GetChunkIDsResponse) GoString() string {
 	s = append(s, "}")
 	return strings.Join(s, "")
 }
+func (this *ChunkRef) GoString() string {
+	if this == nil {
+		return "nil"
+	}
+	s := make([]string, 0, 9)
+	s = append(s, "&logproto.ChunkRef{")
+	s = append(s, "Fingerprint: "+fmt.Sprintf("%#v", this.Fingerprint)+",\n")
+	s = append(s, "UserID: "+fmt.Sprintf("%#v", this.UserID)+",\n")
+	s = append(s, "From: "+fmt.Sprintf("%#v", this.From)+",\n")
+	s = append(s, "Through: "+fmt.Sprintf("%#v", this.Through)+",\n")
+	s = append(s, "Checksum: "+fmt.Sprintf("%#v", this.Checksum)+",\n")
+	s = append(s, "}")
+	return strings.Join(s, "")
+}
 func valueToGoStringLogproto(v interface{}, typ string) string {
 	rv := reflect.ValueOf(v)
 	if rv.IsNil() {
@@ -4815,6 +4943,56 @@ func (m *GetChunkIDsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *ChunkRef) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *ChunkRef) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ChunkRef) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Checksum != 0 {
+		i = encodeVarintLogproto(dAtA, i, uint64(m.Checksum))
+		i--
+		dAtA[i] = 0x28
+	}
+	if m.Through != 0 {
+		i = encodeVarintLogproto(dAtA, i, uint64(m.Through))
+		i--
+		dAtA[i] = 0x20
+	}
+	if m.From != 0 {
+		i = encodeVarintLogproto(dAtA, i, uint64(m.From))
+		i--
+		dAtA[i] = 0x18
+	}
+	if len(m.UserID) > 0 {
+		i -= len(m.UserID)
+		copy(dAtA[i:], m.UserID)
+		i = encodeVarintLogproto(dAtA, i, uint64(len(m.UserID)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if m.Fingerprint != 0 {
+		i = encodeVarintLogproto(dAtA, i, uint64(m.Fingerprint))
+		i--
+		dAtA[i] = 0x8
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintLogproto(dAtA []byte, offset int, v uint64) int {
 	offset -= sovLogproto(v)
 	base := offset
@@ -5350,6 +5528,31 @@ func (m *GetChunkIDsResponse) Size() (n int) {
 	return n
 }
 
+func (m *ChunkRef) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Fingerprint != 0 {
+		n += 1 + sovLogproto(uint64(m.Fingerprint))
+	}
+	l = len(m.UserID)
+	if l > 0 {
+		n += 1 + l + sovLogproto(uint64(l))
+	}
+	if m.From != 0 {
+		n += 1 + sovLogproto(uint64(m.From))
+	}
+	if m.Through != 0 {
+		n += 1 + sovLogproto(uint64(m.Through))
+	}
+	if m.Checksum != 0 {
+		n += 1 + sovLogproto(uint64(m.Checksum))
+	}
+	return n
+}
+
 func sovLogproto(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -5734,6 +5937,20 @@ func (this *GetChunkIDsResponse) String() string {
 	}, "")
 	return s
 }
+func (this *ChunkRef) String() string {
+	if this == nil {
+		return "nil"
+	}
+	s := strings.Join([]string{`&ChunkRef{`,
+		`Fingerprint:` + fmt.Sprintf("%v", this.Fingerprint) + `,`,
+		`UserID:` + fmt.Sprintf("%v", this.UserID) + `,`,
+		`From:` + fmt.Sprintf("%v", this.From) + `,`,
+		`Through:` + fmt.Sprintf("%v", this.Through) + `,`,
+		`Checksum:` + fmt.Sprintf("%v", this.Checksum) + `,`,
+		`}`,
+	}, "")
+	return s
+}
 func valueToStringLogproto(v interface{}) string {
 	rv := reflect.ValueOf(v)
 	if rv.IsNil() {
@@ -9362,6 +9579,167 @@ func (m *GetChunkIDsResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *ChunkRef) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowLogproto
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: ChunkRef: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ChunkRef: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Fingerprint", wireType)
+			}
+			m.Fingerprint = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowLogproto
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Fingerprint |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field UserID", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowLogproto
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthLogproto
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthLogproto
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.UserID = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field From", wireType)
+			}
+			m.From = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowLogproto
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.From |= github_com_prometheus_common_model.Time(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Through", wireType)
+			}
+			m.Through = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowLogproto
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Through |= github_com_prometheus_common_model.Time(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 5:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Checksum", wireType)
+			}
+			m.Checksum = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowLogproto
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Checksum |= uint32(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		default:
+			iNdEx = preIndex
+			skippy, err := skipLogproto(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthLogproto
+			}
+			if (iNdEx + skippy) < 0 {
+				return ErrInvalidLengthLogproto
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipLogproto(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/pkg/logproto/logproto.proto b/pkg/logproto/logproto.proto
index 7270601e2b759..0c454ad91442e 100644
--- a/pkg/logproto/logproto.proto
+++ b/pkg/logproto/logproto.proto
@@ -194,3 +194,18 @@ message GetChunkIDsRequest {
 message GetChunkIDsResponse {
   repeated string chunkIDs = 1;
 }
+
+// ChunkRef contains the metadata to reference a Chunk.
+// It is embedded by the Chunk type itself and used to generate the Chunk
+// checksum. So it is imported to take care of the JSON representation of the
+// resulting Go struct.
+message ChunkRef {
+  uint64 fingerprint = 1 [(gogoproto.jsontag) = "fingerprint"];
+  string user_id = 2 [(gogoproto.customname) = "UserID", (gogoproto.jsontag) = "userID"];
+  int64 from = 3 [(gogoproto.jsontag) = "from", (gogoproto.customtype) = "github.com/prometheus/common/model.Time", (gogoproto.nullable) = false];
+  int64 through = 4 [(gogoproto.jsontag) = "through", (gogoproto.customtype) = "github.com/prometheus/common/model.Time", (gogoproto.nullable) = false];
+
+  // The checksum is not written to the external storage. We use crc32,
+  // Castagnoli table. See http://www.evanjones.ca/crc32c.html.
+  uint32 checksum = 5 [(gogoproto.jsontag) = "-"];
+}
diff --git a/pkg/logproto/types.go b/pkg/logproto/types.go
index 554ca79c469fc..d80f8c2af3475 100644
--- a/pkg/logproto/types.go
+++ b/pkg/logproto/types.go
@@ -4,6 +4,8 @@ import (
 	fmt "fmt"
 	io "io"
 	"time"
+
+	"github.com/prometheus/common/model"
 )
 
 // Stream contains a unique labels set as a string and a set of entries for it.
@@ -463,3 +465,7 @@ func (m *Entry) Equal(that interface{}) bool {
 	}
 	return true
 }
+
+func (c *ChunkRef) FingerprintModel() model.Fingerprint {
+	return model.Fingerprint(c.Fingerprint)
+}
diff --git a/pkg/storage/batch.go b/pkg/storage/batch.go
index 5bb073424d98b..e394388c82994 100644
--- a/pkg/storage/batch.go
+++ b/pkg/storage/batch.go
@@ -775,7 +775,7 @@ func loadFirstChunks(ctx context.Context, s chunk.SchemaConfig, chks map[model.F
 func partitionBySeriesChunks(chunks []*LazyChunk) map[model.Fingerprint][][]*LazyChunk {
 	chunksByFp := map[model.Fingerprint][]*LazyChunk{}
 	for _, c := range chunks {
-		fp := c.Chunk.Fingerprint
+		fp := c.Chunk.FingerprintModel()
 		chunksByFp[fp] = append(chunksByFp[fp], c)
 	}
 	result := make(map[model.Fingerprint][][]*LazyChunk, len(chunksByFp))
diff --git a/pkg/storage/chunk/cache/cache_test.go b/pkg/storage/chunk/cache/cache_test.go
index 4e243a98bf22b..727b965d39e28 100644
--- a/pkg/storage/chunk/cache/cache_test.go
+++ b/pkg/storage/chunk/cache/cache_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/storage/chunk"
 	"github.com/grafana/loki/pkg/storage/chunk/cache"
 	prom_chunk "github.com/grafana/loki/pkg/storage/chunk/encoding"
@@ -58,11 +59,13 @@ func fillCache(t *testing.T, scfg chunk.SchemaConfig, cache cache.Cache) ([]stri
 		// cleanup the chunk to avoid any internal references mismatch (ie. appender
 		// pointer).
 		cleanChunk := chunk.Chunk{
-			UserID:      c.UserID,
-			Fingerprint: c.Fingerprint,
-			From:        c.From,
-			Through:     c.Through,
-			Checksum:    c.Checksum,
+			ChunkRef: logproto.ChunkRef{
+				UserID:      c.UserID,
+				Fingerprint: c.Fingerprint,
+				From:        c.From,
+				Through:     c.Through,
+				Checksum:    c.Checksum,
+			},
 			ChecksumSet: c.ChecksumSet,
 		}
 		err = cleanChunk.Decode(chunk.NewDecodeContext(), buf)
diff --git a/pkg/storage/chunk/chunk.go b/pkg/storage/chunk/chunk.go
index 3ad05515ea4d1..8c325c4302fca 100644
--- a/pkg/storage/chunk/chunk.go
+++ b/pkg/storage/chunk/chunk.go
@@ -17,6 +17,7 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	errs "github.com/weaveworks/common/errors"
 
+	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/prom1/storage/metric"
 	prom_chunk "github.com/grafana/loki/pkg/storage/chunk/encoding"
 )
@@ -37,21 +38,12 @@ func errInvalidChunkID(s string) error {
 
 // Chunk contains encoded timeseries data
 type Chunk struct {
-	// These two fields will be missing from older chunks (as will the hash).
-	// On fetch we will initialise these fields from the DynamoDB key.
-	Fingerprint model.Fingerprint `json:"fingerprint"`
-	UserID      string            `json:"userID"`
-
-	// These fields will be in all chunks, including old ones.
-	From    model.Time    `json:"from"`
-	Through model.Time    `json:"through"`
-	Metric  labels.Labels `json:"metric"`
-
-	// The hash is not written to the external storage either.  We use
-	// crc32, Castagnoli table.  See http://www.evanjones.ca/crc32c.html.
+	logproto.ChunkRef
+
+	Metric labels.Labels `json:"metric"`
+
 	// For old chunks, ChecksumSet will be false.
-	ChecksumSet bool   `json:"-"`
-	Checksum    uint32 `json:"-"`
+	ChecksumSet bool `json:"-"`
 
 	// We never use Delta encoding (the zero value), so if this entry is
 	// missing, we default to DoubleDelta.
@@ -65,13 +57,15 @@ type Chunk struct {
 // NewChunk creates a new chunk
 func NewChunk(userID string, fp model.Fingerprint, metric labels.Labels, c prom_chunk.Chunk, from, through model.Time) Chunk {
 	return Chunk{
-		Fingerprint: fp,
-		UserID:      userID,
-		From:        from,
-		Through:     through,
-		Metric:      metric,
-		Encoding:    c.Encoding(),
-		Data:        c,
+		ChunkRef: logproto.ChunkRef{
+			Fingerprint: uint64(fp),
+			UserID:      userID,
+			From:        from,
+			Through:     through,
+		},
+		Metric:   metric,
+		Encoding: c.Encoding(),
+		Data:     c,
 	}
 }
 
@@ -120,10 +114,12 @@ func parseLegacyChunkID(userID, key string) (Chunk, error) {
 		return Chunk{}, err
 	}
 	return Chunk{
-		UserID:      userID,
-		Fingerprint: model.Fingerprint(fingerprint),
-		From:        model.Time(from),
-		Through:     model.Time(through),
+		ChunkRef: logproto.ChunkRef{
+			UserID:      userID,
+			Fingerprint: fingerprint,
+			From:        model.Time(from),
+			Through:     model.Time(through),
+		},
 	}, nil
 }
 
@@ -169,11 +165,13 @@ func parseNewExternalKey(userID, key string) (Chunk, error) {
 		return Chunk{}, err
 	}
 	return Chunk{
-		UserID:      userID,
-		Fingerprint: model.Fingerprint(fingerprint),
-		From:        model.Time(from),
-		Through:     model.Time(through),
-		Checksum:    uint32(checksum),
+		ChunkRef: logproto.ChunkRef{
+			UserID:      userID,
+			Fingerprint: fingerprint,
+			From:        model.Time(from),
+			Through:     model.Time(through),
+			Checksum:    uint32(checksum),
+		},
 		ChecksumSet: true,
 	}, nil
 }
@@ -226,11 +224,13 @@ func parseNewerExternalKey(userID, key string) (Chunk, error) {
 		return Chunk{}, errors.Wrap(err, "parsing checksum")
 	}
 	return Chunk{
-		UserID:      userID,
-		Fingerprint: model.Fingerprint(fingerprint),
-		From:        model.Time(from),
-		Through:     model.Time(through),
-		Checksum:    uint32(checksum),
+		ChunkRef: logproto.ChunkRef{
+			UserID:      userID,
+			Fingerprint: fingerprint,
+			From:        model.Time(from),
+			Through:     model.Time(through),
+			Checksum:    uint32(checksum),
+		},
 		ChecksumSet: true,
 	}, nil
 }
@@ -427,6 +427,6 @@ func (c *Chunk) Slice(from, through model.Time) (*Chunk, error) {
 		return nil, err
 	}
 
-	nc := NewChunk(c.UserID, c.Fingerprint, c.Metric, pc, from, through)
+	nc := NewChunk(c.UserID, c.FingerprintModel(), c.Metric, pc, from, through)
 	return &nc, nil
 }
diff --git a/pkg/storage/chunk/chunk_store_utils.go b/pkg/storage/chunk/chunk_store_utils.go
index c04b5c88f1015..ae969fc343c24 100644
--- a/pkg/storage/chunk/chunk_store_utils.go
+++ b/pkg/storage/chunk/chunk_store_utils.go
@@ -61,12 +61,12 @@ func filterChunksByUniqueFingerprint(s SchemaConfig, chunks []Chunk) ([]Chunk, [
 	uniqueFp := map[model.Fingerprint]struct{}{}
 
 	for _, chunk := range chunks {
-		if _, ok := uniqueFp[chunk.Fingerprint]; ok {
+		if _, ok := uniqueFp[chunk.FingerprintModel()]; ok {
 			continue
 		}
 		filtered = append(filtered, chunk)
 		keys = append(keys, s.ExternalKey(chunk))
-		uniqueFp[chunk.Fingerprint] = struct{}{}
+		uniqueFp[chunk.FingerprintModel()] = struct{}{}
 	}
 	return filtered, keys
 }
diff --git a/pkg/storage/chunk/chunk_test.go b/pkg/storage/chunk/chunk_test.go
index c443474be8783..e8cedb62ea1c9 100644
--- a/pkg/storage/chunk/chunk_test.go
+++ b/pkg/storage/chunk/chunk_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/loki/pkg/ingester/client"
+	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/storage/chunk/encoding"
 	"github.com/grafana/loki/pkg/util"
 )
@@ -197,28 +198,34 @@ func TestParseExternalKey(t *testing.T) {
 		err   error
 	}{
 		{key: "2:1484661279394:1484664879394", chunk: Chunk{
-			UserID:      userID,
-			Fingerprint: model.Fingerprint(2),
-			From:        model.Time(1484661279394),
-			Through:     model.Time(1484664879394),
+			ChunkRef: logproto.ChunkRef{
+				UserID:      userID,
+				Fingerprint: uint64(2),
+				From:        model.Time(1484661279394),
+				Through:     model.Time(1484664879394),
+			},
 		}},
 
 		{key: userID + "/2:270d8f00:270d8f00:f84c5745", chunk: Chunk{
-			UserID:      userID,
-			Fingerprint: model.Fingerprint(2),
-			From:        model.Time(655200000),
-			Through:     model.Time(655200000),
+			ChunkRef: logproto.ChunkRef{
+				UserID:      userID,
+				Fingerprint: uint64(2),
+				From:        model.Time(655200000),
+				Through:     model.Time(655200000),
+				Checksum:    4165752645,
+			},
 			ChecksumSet: true,
-			Checksum:    4165752645,
 		}},
 
 		{key: userID + "/2/270d8f00:270d8f00:f84c5745", chunk: Chunk{
-			UserID:      userID,
-			Fingerprint: model.Fingerprint(2),
-			From:        model.Time(655200000),
-			Through:     model.Time(655200000),
+			ChunkRef: logproto.ChunkRef{
+				UserID:      userID,
+				Fingerprint: uint64(2),
+				From:        model.Time(655200000),
+				Through:     model.Time(655200000),
+				Checksum:    4165752645,
+			},
 			ChecksumSet: true,
-			Checksum:    4165752645,
 		}},
 
 		{key: "invalidUserID/2:270d8f00:270d8f00:f84c5745", chunk: Chunk{}, err: ErrWrongMetadata},
@@ -417,29 +424,14 @@ func TestChunkKeys(t *testing.T) {
 		{
 			name: "Legacy key (pre-checksum)",
 			chunk: Chunk{
-				Fingerprint: 100,
-				UserID:      "fake",
-				From:        model.TimeFromUnix(1000),
-				Through:     model.TimeFromUnix(5000),
-			},
-			schemaCfg: SchemaConfig{
-				Configs: []PeriodConfig{
-					{
-						From:   DayTime{Time: 0},
-						Schema: "v9",
-					},
+				ChunkRef: logproto.ChunkRef{
+					Fingerprint: 100,
+					UserID:      "fake",
+					From:        model.TimeFromUnix(1000),
+					Through:     model.TimeFromUnix(5000),
+					Checksum:    12345,
 				},
-			},
-		},
-		{
-			name: "New key (post-checksum)",
-			chunk: Chunk{
-				Fingerprint: 100,
-				UserID:      "fake",
-				From:        model.TimeFromUnix(1000),
-				Through:     model.TimeFromUnix(5000),
 				ChecksumSet: true,
-				Checksum:    12345,
 			},
 			schemaCfg: SchemaConfig{
 				Configs: []PeriodConfig{
@@ -454,12 +446,14 @@ func TestChunkKeys(t *testing.T) {
 		{
 			name: "Newer key (post-v12)",
 			chunk: Chunk{
-				Fingerprint: 100,
-				UserID:      "fake",
-				From:        model.TimeFromUnix(1000),
-				Through:     model.TimeFromUnix(5000),
+				ChunkRef: logproto.ChunkRef{
+					Fingerprint: 100,
+					UserID:      "fake",
+					From:        model.TimeFromUnix(1000),
+					Through:     model.TimeFromUnix(5000),
+					Checksum:    12345,
+				},
 				ChecksumSet: true,
-				Checksum:    12345,
 			},
 			schemaCfg: SchemaConfig{
 				Configs: []PeriodConfig{
diff --git a/pkg/storage/chunk/fixtures.go b/pkg/storage/chunk/fixtures.go
index b166d584a730e..e5c070606f475 100644
--- a/pkg/storage/chunk/fixtures.go
+++ b/pkg/storage/chunk/fixtures.go
@@ -67,8 +67,8 @@ func ChunksToMatrix(ctx context.Context, chunks []Chunk, from, through model.Tim
 			return nil, err
 		}
 
-		metrics[c.Fingerprint] = util.LabelsToMetric(c.Metric)
-		samplesBySeries[c.Fingerprint] = append(samplesBySeries[c.Fingerprint], ss)
+		metrics[c.FingerprintModel()] = util.LabelsToMetric(c.Metric)
+		samplesBySeries[c.FingerprintModel()] = append(samplesBySeries[c.FingerprintModel()], ss)
 	}
 
 	matrix := make(model.Matrix, 0, len(samplesBySeries))
diff --git a/pkg/storage/chunk/grpc/grpc_client_test.go b/pkg/storage/chunk/grpc/grpc_client_test.go
index 0de9650a9f446..40482fa0c2404 100644
--- a/pkg/storage/chunk/grpc/grpc_client_test.go
+++ b/pkg/storage/chunk/grpc/grpc_client_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/storage/chunk"
 	"github.com/grafana/loki/pkg/storage/chunk/encoding"
 	prom_chunk "github.com/grafana/loki/pkg/storage/chunk/encoding"
@@ -78,10 +79,13 @@ func TestGrpcStore(t *testing.T) {
 
 	putChunksTestData := []chunk.Chunk{
 		{
-			Fingerprint: 15993187966453505842,
-			UserID:      "fake",
-			From:        1587997054298,
-			Through:     1587997054298,
+			ChunkRef: logproto.ChunkRef{
+				Fingerprint: uint64(15993187966453505842),
+				UserID:      "fake",
+				From:        1587997054298,
+				Through:     1587997054298,
+				Checksum:    3651208117,
+			},
 			Metric: labels.Labels{
 				{
 					Name:  "_name_",
@@ -97,7 +101,6 @@ func TestGrpcStore(t *testing.T) {
 				},
 			},
 			ChecksumSet: true,
-			Checksum:    3651208117,
 			Encoding:    encoding.Bigchunk,
 			Data:        prom_chunk.New(),
 		},
@@ -107,10 +110,13 @@ func TestGrpcStore(t *testing.T) {
 
 	getChunksTestData := []chunk.Chunk{
 		{
-			Fingerprint: 15993187966453505842,
-			UserID:      "fake",
-			From:        1587997054298,
-			Through:     1587997054298,
+			ChunkRef: logproto.ChunkRef{
+				Fingerprint: uint64(15993187966453505842),
+				UserID:      "fake",
+				From:        1587997054298,
+				Through:     1587997054298,
+				Checksum:    3651208117,
+			},
 			Metric: labels.Labels{
 				{
 					Name:  "_name_",
@@ -126,7 +132,6 @@ func TestGrpcStore(t *testing.T) {
 				},
 			},
 			ChecksumSet: true,
-			Checksum:    3651208117,
 			Encoding:    encoding.Bigchunk,
 			Data:        prom_chunk.New(),
 		},
diff --git a/pkg/storage/chunk/objectclient/client_test.go b/pkg/storage/chunk/objectclient/client_test.go
index 2fa659a2806ad..ee06234de2c74 100644
--- a/pkg/storage/chunk/objectclient/client_test.go
+++ b/pkg/storage/chunk/objectclient/client_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/storage/chunk"
 )
 
@@ -36,21 +37,25 @@ func TestFSEncoder(t *testing.T) {
 
 	// chunk that resolves to v11
 	oldChunk := chunk.Chunk{
-		UserID:      "fake",
-		From:        MustParseDayTime("2020-01-02").Time,
-		Through:     MustParseDayTime("2020-01-03").Time,
-		Checksum:    123,
-		Fingerprint: 456,
+		ChunkRef: logproto.ChunkRef{
+			UserID:      "fake",
+			From:        MustParseDayTime("2020-01-02").Time,
+			Through:     MustParseDayTime("2020-01-03").Time,
+			Fingerprint: uint64(456),
+			Checksum:    123,
+		},
 		ChecksumSet: true,
 	}
 
 	// chunk that resolves to v12
 	newChunk := chunk.Chunk{
-		UserID:      "fake",
-		From:        MustParseDayTime("2022-01-02").Time,
-		Through:     MustParseDayTime("2022-01-03").Time,
-		Checksum:    123,
-		Fingerprint: 456,
+		ChunkRef: logproto.ChunkRef{
+			UserID:      "fake",
+			From:        MustParseDayTime("2022-01-02").Time,
+			Through:     MustParseDayTime("2022-01-03").Time,
+			Fingerprint: uint64(456),
+			Checksum:    123,
+		},
 		ChecksumSet: true,
 	}
 
diff --git a/pkg/storage/chunk/schema_config.go b/pkg/storage/chunk/schema_config.go
index 979d104373060..12f4b3128630d 100644
--- a/pkg/storage/chunk/schema_config.go
+++ b/pkg/storage/chunk/schema_config.go
@@ -478,10 +478,10 @@ func (cfg SchemaConfig) legacyExternalKey(chunk Chunk) string {
 // post-checksum
 func (cfg SchemaConfig) newExternalKey(chunk Chunk) string {
 	// This is the inverse of chunk.parseNewExternalKey.
-	return fmt.Sprintf("%s/%x:%x:%x:%x", chunk.UserID, uint64(chunk.Fingerprint), int64(chunk.From), int64(chunk.Through), chunk.Checksum)
+	return fmt.Sprintf("%s/%x:%x:%x:%x", chunk.UserID, chunk.Fingerprint, int64(chunk.From), int64(chunk.Through), chunk.Checksum)
 }
 
 // v12+
 func (cfg SchemaConfig) newerExternalKey(chunk Chunk) string {
-	return fmt.Sprintf("%s/%x/%x:%x:%x", chunk.UserID, uint64(chunk.Fingerprint), int64(chunk.From), int64(chunk.Through), chunk.Checksum)
+	return fmt.Sprintf("%s/%x/%x:%x:%x", chunk.UserID, chunk.Fingerprint, int64(chunk.From), int64(chunk.Through), chunk.Checksum)
 }
diff --git a/pkg/storage/lazy_chunk_test.go b/pkg/storage/lazy_chunk_test.go
index c29e37ef6f8ce..29b81fc0bad4d 100644
--- a/pkg/storage/lazy_chunk_test.go
+++ b/pkg/storage/lazy_chunk_test.go
@@ -161,8 +161,10 @@ func lazyChunkWithBounds(from, through time.Time) *LazyChunk {
 	fromM, throughM := util.RoundToMilliseconds(from, through)
 	return &LazyChunk{
 		Chunk: chunk.Chunk{
-			From:    fromM,
-			Through: throughM,
+			ChunkRef: logproto.ChunkRef{
+				From:    fromM,
+				Through: throughM,
+			},
 		},
 	}
 }
diff --git a/pkg/storage/stores/shipper/compactor/retention/retention.go b/pkg/storage/stores/shipper/compactor/retention/retention.go
index af85b35d23294..8956897682504 100644
--- a/pkg/storage/stores/shipper/compactor/retention/retention.go
+++ b/pkg/storage/stores/shipper/compactor/retention/retention.go
@@ -341,7 +341,7 @@ func (c *chunkRewriter) rewriteChunk(ctx context.Context, ce ChunkEntry, interva
 		}
 
 		newChunk := chunk.NewChunk(
-			userID, chks[0].Fingerprint, chks[0].Metric,
+			userID, chks[0].FingerprintModel(), chks[0].Metric,
 			facade,
 			interval.Start,
 			interval.End,