killbill-uncached

diff --git a/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql b/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
index 152521c..0b1b84a 100644
--- a/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
+++ b/tenant/src/main/resources/org/killbill/billing/tenant/ddl.sql
@@ -32,7 +32,7 @@ CREATE TABLE tenant_kvs (
    updated_by varchar(50) DEFAULT NULL,
    PRIMARY KEY(record_id)
 ) /*! CHARACTER SET utf8 COLLATE utf8_bin */;
-CREATE INDEX tenant_kvs_key ON tenant_kvs(tenant_key);
+CREATE INDEX tenant_kvs_trid_key ON tenant_kvs(tenant_record_id, tenant_key);
 
 
 DROP TABLE IF EXISTS tenant_broadcasts;

diff --git a/tenant/src/main/resources/org/killbill/billing/tenant/migration/V20181205101746__tenant_tenant_kvs_trid_key_idx.sql b/tenant/src/main/resources/org/killbill/billing/tenant/migration/V20181205101746__tenant_tenant_kvs_trid_key_idx.sql
new file mode 100644
index 0000000..9fd7191
--- /dev/null
+++ b/tenant/src/main/resources/org/killbill/billing/tenant/migration/V20181205101746__tenant_tenant_kvs_trid_key_idx.sql
@@ -0,0 +1,2 @@
+CREATE INDEX tenant_kvs_trid_key ON tenant_kvs(tenant_record_id, tenant_key);
+DROP INDEX tenant_kvs_key ON tenant_kvs;