killbill-memoizeit

diff --git a/account/src/main/java/org/killbill/billing/account/api/svcs/DefaultImmutableAccountInternalApi.java b/account/src/main/java/org/killbill/billing/account/api/svcs/DefaultImmutableAccountInternalApi.java
index e4f902f..c9e39a5 100644
--- a/account/src/main/java/org/killbill/billing/account/api/svcs/DefaultImmutableAccountInternalApi.java
+++ b/account/src/main/java/org/killbill/billing/account/api/svcs/DefaultImmutableAccountInternalApi.java
@@ -77,7 +77,7 @@ public class DefaultImmutableAccountInternalApi implements ImmutableAccountInter
         return getImmutableAccountDataByRecordId(recordId, context);
     }
 
-public static SingleCache<Parameters, ImmutableAccountData> getImmutableAccountDataByRecordId = new SingleCache<>("static-single:49#DefaultImmutableAccountInternalApi.getImmutableAccountDataByRecordId");
+public static SingleCache<Parameters, ImmutableAccountData> getImmutableAccountDataByRecordId = new SingleCache<>("static-single:14#DefaultImmutableAccountInternalApi.getImmutableAccountDataByRecordId");
 
     @Override
     public ImmutableAccountData getImmutableAccountDataByRecordId(final Long recordId, final InternalTenantContext context) throws AccountApiException {
@@ -102,8 +102,8 @@ return getImmutableAccountDataByRecordId.computeIfAbsent(new Parameters(recordId
     //     return new CacheLoaderArgument(null, args, context);
     // }
 
-public static SingleCache<Parameters, AccountModelDao> inTransactionCache = new SingleCache<>("static-single:42#DefaultImmutableAccountInternalApi.inTransaction");
-public static SingleCache<Parameters, Account> getAccountByRecordIdInternal = new SingleCache<>("static-single:45#DefaultImmutableAccountInternalApi.getAccountByRecordIdInternal");
+public static SingleCache<Parameters, AccountModelDao> inTransactionCache = new SingleCache<>("static-single:21#DefaultImmutableAccountInternalApi.inTransaction");
+public static SingleCache<Parameters, Account> getAccountByRecordIdInternal = new SingleCache<>("static-single:18#DefaultImmutableAccountInternalApi.getAccountByRecordIdInternal");
 
     private Account getAccountByRecordIdInternal(final Long recordId, final InternalTenantContext context) {
 return getAccountByRecordIdInternal.computeIfAbsent(new Parameters(recordId, context), () -> {

diff --git a/account/src/main/java/org/killbill/billing/account/dao/DefaultAccountDao.java b/account/src/main/java/org/killbill/billing/account/dao/DefaultAccountDao.java
index f9478df..9ff9e4c 100644
--- a/account/src/main/java/org/killbill/billing/account/dao/DefaultAccountDao.java
+++ b/account/src/main/java/org/killbill/billing/account/dao/DefaultAccountDao.java
@@ -138,7 +138,7 @@ public class DefaultAccountDao extends EntityDaoBase<AccountModelDao, Account, A
         }
     }
 
-public static SingleCache<Parameters, AccountModelDao> inTransaction = new SingleCache<>("static-single:11#DefaultAccountDao.inTransaction"); 
+public static SingleCache<Parameters, AccountModelDao> inTransaction = new SingleCache<>("static-single:53#DefaultAccountDao.inTransaction"); 
 
     @Override
     public AccountModelDao getAccountByKey(final String key, final InternalTenantContext context) {

diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/engine/core/EntitlementUtils.java b/entitlement/src/main/java/org/killbill/billing/entitlement/engine/core/EntitlementUtils.java
index 1bdb70b..a793f8e 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/engine/core/EntitlementUtils.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/engine/core/EntitlementUtils.java
@@ -89,7 +89,7 @@ public class EntitlementUtils {
         dao.setBlockingStatesAndPostBlockingTransitionEvent(ImmutableMap.<BlockingState, Optional<UUID>>of(state, Optional.<UUID>fromNullable(bundleId)), context);
     }
 
-public static SingleCache<Parameters, UUID> getFirstActiveSubscriptionIdForKeyOrNull = new SingleCache<>("static-single:1#EntitlementUtils.getFirstActiveSubscriptionIdForKeyOrNull"); 
+public static SingleCache<Parameters, UUID> getFirstActiveSubscriptionIdForKeyOrNull = new SingleCache<>("static-single:62#EntitlementUtils.getFirstActiveSubscriptionIdForKeyOrNull"); 
 
     /**
      * @param externalKey   the bundle externalKey

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java b/invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java
index 1925543..59644ab 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/api/user/DefaultInvoiceUserApi.java
@@ -196,7 +196,7 @@ public class DefaultInvoiceUserApi implements InvoiceUserApi {
                                              );
     }
 
-public static SingleCache<Parameters, BigDecimal> getAccountBalanceCache = new SingleCache<>("static-single:59#DefaultInvoiceUserApi.getAccountBalance");
+public static SingleCache<Parameters, BigDecimal> getAccountBalanceCache = new SingleCache<>("static-single:4#DefaultInvoiceUserApi.getAccountBalance");
 
     @Override
     public BigDecimal getAccountBalance(final UUID accountId, final TenantContext context) {
@@ -206,7 +206,7 @@ return getAccountBalanceCache.computeIfAbsent(new Parameters(accountId, context)
 }, 20000);
     }
 
-public static SingleCache<Parameters, BigDecimal> getAccountCBACache = new SingleCache<>("static-single:58#DefaultInvoiceUserApi.getAccountCBA");
+public static SingleCache<Parameters, BigDecimal> getAccountCBACache = new SingleCache<>("static-single:5#DefaultInvoiceUserApi.getAccountCBA");
 
     @Override
     public BigDecimal getAccountCBA(final UUID accountId, final TenantContext context) {

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/CBADao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/CBADao.java
index 73154f5..bf06495 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/CBADao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/CBADao.java
@@ -50,7 +50,7 @@ public class CBADao {
         this.invoiceDaoHelper = invoiceDaoHelper;
     }
 
-public static SingleCache<Parameters, BigDecimal> getAccountCBAFromTransactionCache = new SingleCache<>("static-single:41#CBADao.getAccountCBAFromTransaction");
+public static SingleCache<Parameters, BigDecimal> getAccountCBAFromTransactionCache = new SingleCache<>("static-single:22#CBADao.getAccountCBAFromTransaction");
 
     // PERF: Compute the CBA directly in the database (faster than re-constructing all invoices)
     public BigDecimal getAccountCBAFromTransaction(final EntitySqlDaoWrapperFactory entitySqlDaoWrapperFactory, final InternalTenantContext context) {

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
index 85816cb..c0fc29d 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
@@ -487,7 +487,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
 
     }
 
-public static SingleCache<Parameters, BigDecimal> getAccountBalanceCache = new SingleCache<>("static-single:55#DefaultInvoiceDao.getAccountBalance");
+public static SingleCache<Parameters, BigDecimal> getAccountBalanceCache = new SingleCache<>("static-single:8#DefaultInvoiceDao.getAccountBalance");
 
     @Override
     public BigDecimal getAccountBalance(final UUID accountId, final InternalTenantContext context) {
@@ -525,7 +525,7 @@ return getAccountBalanceCache.computeIfAbsent(new Parameters(accountId, context)
 }, 20000);
     }
 
-public static SingleCache<Parameters, BigDecimal> getAccountCBA = new SingleCache<>("static-single:48#DefaultInvoiceDao.getAccountCBA");
+public static SingleCache<Parameters, BigDecimal> getAccountCBA = new SingleCache<>("static-single:15#DefaultInvoiceDao.getAccountCBA");
 
     @Override
     public BigDecimal getAccountCBA(final UUID accountId, final InternalTenantContext context) {
@@ -551,7 +551,7 @@ return getAccountCBA.computeIfAbsent(new Parameters(accountId, context), () -> {
         });
     }
 
-public static SingleCache<Parameters, UUID> inTransaction13 = new SingleCache<>("static-single:46#DefaultInvoiceDao.inTransaction13");
+public static SingleCache<Parameters, UUID> inTransaction13 = new SingleCache<>("static-single:17#DefaultInvoiceDao.inTransaction13");
     @Override
     public UUID getInvoiceIdByPaymentId(final UUID paymentId, final InternalTenantContext context) {
         return transactionalSqlDao.execute(true, new EntitySqlDaoTransactionWrapper<UUID>() {
@@ -564,7 +564,7 @@ return inTransaction13.computeIfAbsent(new Parameters(entitySqlDaoWrapperFactory
         });
     }
 
-public static SingleCache<Parameters, List<InvoicePaymentModelDao>> inTransaction14 = new SingleCache<>("static-single:43#DefaultInvoiceDao.inTransaction14");
+public static SingleCache<Parameters, List<InvoicePaymentModelDao>> inTransaction14 = new SingleCache<>("static-single:20#DefaultInvoiceDao.inTransaction14");
 
     @Override
     public List<InvoicePaymentModelDao> getInvoicePaymentsByPaymentId(final UUID paymentId, final InternalTenantContext context) {
@@ -1399,7 +1399,7 @@ return inTransaction14.computeIfAbsent(new Parameters(entitySqlDaoWrapperFactory
         });
     }
 
-public static SingleCache<Parameters, List<Tag>> getInvoicesTags = new SingleCache<>("static-single:52#DefaultInvoiceDao.getInvoicesTags");
+public static SingleCache<Parameters, List<Tag>> getInvoicesTags = new SingleCache<>("static-single:11#DefaultInvoiceDao.getInvoicesTags");
 
     // PERF: fetch tags once. See also https://github.com/killbill/killbill/issues/720.
     private List<Tag> getInvoicesTags(final InternalTenantContext context) {

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
index 7f6b995..639a771 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
@@ -220,7 +220,7 @@ public class AccountResource extends JaxRsResourceBase {
         return Response.status(Status.OK).entity(accountJson).build();
     }
 
-public static SingleCache<Parameters, AccountJson> apply = new SingleCache<>("static-single:60#AccountResource.apply");
+public static SingleCache<Parameters, AccountJson> apply = new SingleCache<>("static-single:3#AccountResource.apply");
 
     @TimedResource
     @GET
@@ -351,7 +351,7 @@ public static SingleCache<Parameters, AccountJson> apply = new SingleCache<>("st
         return Response.status(Status.OK).entity(accountJson).build();
     }
 
-public static SingleCache<Parameters, AccountJson> getAccount = new SingleCache<>("static-single:61#AccountResource.getAccount");
+public static SingleCache<Parameters, AccountJson> getAccount = new SingleCache<>("static-single:2#AccountResource.getAccount");
 
     private AccountJson getAccount(final Account account, final Boolean accountWithBalance, final Boolean accountWithBalanceAndCBA,
                                    final AccountAuditLogs auditLogs, final TenantContext tenantContext) {

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/PaymentMethodProcessor.java b/payment/src/main/java/org/killbill/billing/payment/core/PaymentMethodProcessor.java
index ac3b272..2ba9bc3 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/PaymentMethodProcessor.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/PaymentMethodProcessor.java
@@ -324,7 +324,7 @@ public class PaymentMethodProcessor extends ProcessorBase {
         }
     }
 
-public static MultiCache<Parameters, List<PaymentMethod>> getPaymentMethods = new MultiCache<>("static-multi:25#PaymentMethodProcessor.getPaymentMethods");
+public static MultiCache<Parameters, List<PaymentMethod>> getPaymentMethods = new MultiCache<>("static-multi:37#PaymentMethodProcessor.getPaymentMethods");
 
     public List<PaymentMethod> getPaymentMethods(final boolean includedInactive, final boolean withPluginInfo, final Iterable<PluginProperty> properties, final InternalTenantContext context) {//throws PaymentApiException {
 return getPaymentMethods.computeIfAbsent(new Parameters(includedInactive, withPluginInfo, properties, context),  () -> {

diff --git a/tenant/src/main/java/org/killbill/billing/tenant/api/user/DefaultTenantUserApi.java b/tenant/src/main/java/org/killbill/billing/tenant/api/user/DefaultTenantUserApi.java
index d32ee79..4d27aa4 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/api/user/DefaultTenantUserApi.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/api/user/DefaultTenantUserApi.java
@@ -135,7 +135,7 @@ public class DefaultTenantUserApi implements TenantUserApi {
         return tenant;
     }
 
-public static SingleCache<Parameters, Tenant> getTenantById = new SingleCache<>("static-single:3#DefaultTenantUserApi.getTenantById"); 
+public static SingleCache<Parameters, Tenant> getTenantById = new SingleCache<>("static-single:64#DefaultTenantUserApi.getTenantById"); 
 
     @Override
     public Tenant getTenantById(final UUID id) {

diff --git a/tenant/src/main/java/org/killbill/billing/tenant/dao/NoCachingTenantDao.java b/tenant/src/main/java/org/killbill/billing/tenant/dao/NoCachingTenantDao.java
index 5f1eeff..ed5c989 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/dao/NoCachingTenantDao.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/dao/NoCachingTenantDao.java
@@ -64,7 +64,7 @@ public class NoCachingTenantDao extends EntityDaoBase<TenantModelDao, Tenant, Te
              null, internalCallContextFactory), TenantSqlDao.class);
     }
 
-public static SingleCache<Parameters, TenantModelDao> inTransaction = new SingleCache<>("static-single:21#NoCachingTenantDao.inTransaction"); 
+public static SingleCache<Parameters, TenantModelDao> inTransaction = new SingleCache<>("static-single:43#NoCachingTenantDao.inTransaction"); 
 
     @Override
     public TenantModelDao getTenantByApiKey(final String apiKey) {

diff --git a/util/src/main/java/org/killbill/billing/util/audit/dao/DefaultAuditDao.java b/util/src/main/java/org/killbill/billing/util/audit/dao/DefaultAuditDao.java
index d10a853..f3fc650 100644
--- a/util/src/main/java/org/killbill/billing/util/audit/dao/DefaultAuditDao.java
+++ b/util/src/main/java/org/killbill/billing/util/audit/dao/DefaultAuditDao.java
@@ -112,7 +112,7 @@ public class DefaultAuditDao implements AuditDao {
     }
 
 
-public static SingleCache<Parameters, AuditLog> apply = new SingleCache<>("static-single:63#DefaultAuditDao.apply");
+// public static SingleCache<Parameters, AuditLog> apply = new SingleCache<>("static-single:63#DefaultAuditDao.apply");
 
     private Iterator<AuditLog> buildAuditLogsFromModelDao(final Iterator<AuditLogModelDao> auditLogsForAccountRecordId, final InternalTenantContext tenantContext) {
         // final Map<TableName, Map<Long, UUID>> recordIdIdsCache = new HashMap<TableName, Map<Long, UUID>>();
@@ -121,7 +121,7 @@ public static SingleCache<Parameters, AuditLog> apply = new SingleCache<>("stati
                                                                new Function<AuditLogModelDao, AuditLog>() {
                                                                    @Override
                                                                    public AuditLog apply(final AuditLogModelDao input) {
-return apply.computeIfAbsent(new Parameters(input), () -> {
+// return apply.computeIfAbsent(new Parameters(input), () -> {
                                                                        // If input is for e.g. TAG_DEFINITION_HISTORY, retrieve TAG_DEFINITIONS
                                                                        // For tables without history, e.g. TENANT, originalTableNameForHistoryTableName will be null
                                                                        final TableName originalTableNameForHistoryTableName = findTableNameForHistoryTableName(input.getTableName());
@@ -173,7 +173,7 @@ Iterable<RecordIdIdMappings> mappings = null;
                                                                        }
 
                                                                        return new DefaultAuditLog(input, objectType, auditedEntityId);
-}, 20000);
+// }, 20000);
                                                                    }
 
                                                                    private TableName findTableNameForHistoryTableName(final TableName historyTableName) {

diff --git a/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java b/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java
index 50b920f..320bf5a 100644
--- a/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java
+++ b/util/src/main/java/org/killbill/billing/util/callcontext/InternalCallContextFactory.java
@@ -320,7 +320,7 @@ public class InternalCallContextFactory {
                                        updatedDate != null ? createdDate : clock.getUTCNow());
     }
 
-public static SingleCache<Parameters, ImmutableAccountData> getImmutableAccountData = new SingleCache<>("static-single:51#InternalCallContextFactory.getImmutableAccountData"); 
+public static SingleCache<Parameters, ImmutableAccountData> getImmutableAccountData = new SingleCache<>("static-single:12#InternalCallContextFactory.getImmutableAccountData"); 
 
     private ImmutableAccountData getImmutableAccountData(final Long accountRecordId, final Long tenantRecordId) {
 return getImmutableAccountData.computeIfAbsent(new Parameters(accountRecordId, tenantRecordId),  () -> {
@@ -391,7 +391,7 @@ return getImmutableAccountData.computeIfAbsent(new Parameters(accountRecordId, t
         }
     }
 
-public static SingleCache<Parameters, Long> getTenantRecordIdSafe = new SingleCache<>("static-single:39#InternalCallContextFactory.getTenantRecordIdSafe");
+public static SingleCache<Parameters, Long> getTenantRecordIdSafe = new SingleCache<>("static-single:24#InternalCallContextFactory.getTenantRecordIdSafe");
 
     private Long getTenantRecordIdSafe(final TenantContext context) {
 return getTenantRecordIdSafe.computeIfAbsent(new Parameters(context), () -> {
@@ -418,7 +418,7 @@ return getTenantRecordIdSafe.computeIfAbsent(new Parameters(context), () -> {
     // In-code tenant checkers
     //
 
-public static MultiCache<Parameters, Boolean> objectBelongsToTheRightTenant1 = new MultiCache<>("static-multi:44#Parser.objectBelongsToTheRightTenant1");
+public static MultiCache<Parameters, Boolean> objectBelongsToTheRightTenant1 = new MultiCache<>("static-multi:19#Parser.objectBelongsToTheRightTenant1");
 
     private boolean objectBelongsToTheRightTenant(final UUID objectId, final ObjectType objectType, final TenantContext context) throws ObjectDoesNotExist {
 return objectBelongsToTheRightTenant1.computeIfAbsent(new Parameters(objectId, objectType, context), () -> {
@@ -430,7 +430,7 @@ return objectBelongsToTheRightTenant1.computeIfAbsent(new Parameters(objectId, o
 }, 20000);
     }
 
-public static MultiCache<Parameters, Boolean> objectBelongsToTheRightTenant2 = new MultiCache<>("static-multi:44#Parser.objectBelongsToTheRightTenant2");
+public static MultiCache<Parameters, Boolean> objectBelongsToTheRightTenant2 = new MultiCache<>("static-multi:19#Parser.objectBelongsToTheRightTenant2");
 
     private boolean objectBelongsToTheRightTenant(final UUID objectId, final ObjectType objectType, final Long realTenantRecordId) throws ObjectDoesNotExist {
 return objectBelongsToTheRightTenant2.computeIfAbsent(new Parameters(objectId, objectType, realTenantRecordId), () -> {
@@ -450,7 +450,7 @@ return objectBelongsToTheRightTenant2.computeIfAbsent(new Parameters(objectId, o
         return nonEntityDao.retrieveAccountRecordIdFromObject(objectId, objectType, null);
     }
 
-public static MultiCache<Parameters, Long> getTenantRecordIdUnsafe = new MultiCache<>("static-multi:35#InternalCallContextFactory.getTenantRecordIdUnsafe");
+public static MultiCache<Parameters, Long> getTenantRecordIdUnsafe = new MultiCache<>("static-multi:28#InternalCallContextFactory.getTenantRecordIdUnsafe");
 
     private Long getTenantRecordIdUnsafe(final UUID objectId, final ObjectType objectType) {
 return getTenantRecordIdUnsafe.computeIfAbsent(new Parameters(objectId, objectType), () -> {

diff --git a/util/src/main/java/org/killbill/billing/util/dao/DefaultNonEntityDao.java b/util/src/main/java/org/killbill/billing/util/dao/DefaultNonEntityDao.java
index cb0e9dd..6058e03 100644
--- a/util/src/main/java/org/killbill/billing/util/dao/DefaultNonEntityDao.java
+++ b/util/src/main/java/org/killbill/billing/util/dao/DefaultNonEntityDao.java
@@ -110,7 +110,7 @@ public class DefaultNonEntityDao implements NonEntityDao {
         }, objectIdOrNull, objectType, tableName, cache);
     }
 
-public static MultiCache<Parameters, Long> retrieveTenantRecordIdFromObject = new MultiCache<>("static-multi:33#DefaultNonEntityDao.retrieveTenantRecordIdFromObject");
+public static MultiCache<Parameters, Long> retrieveTenantRecordIdFromObject = new MultiCache<>("static-multi:30#DefaultNonEntityDao.retrieveTenantRecordIdFromObject");
 
     @Override
     public Long retrieveTenantRecordIdFromObject(@Nullable final UUID objectId, final ObjectType objectType, @Nullable final Object cache) {
@@ -119,8 +119,8 @@ return retrieveTenantRecordIdFromObject.computeIfAbsent(new Parameters(objectId,
 }, 20000);
     }
 
-public static SingleCache<Parameters, Long> doRetrieve = new SingleCache<>("static-single:36#DefaultNonEntityDao.doRetrieve");
-public static MultiCache<Parameters, Long> retrieveTenantRecordIdFromObjectInTransaction = new MultiCache<>("static-multi:28#DefaultNonEntityDao.retrieveTenantRecordIdFromObjectInTransaction");
+// public static SingleCache<Parameters, Long> doRetrieve = new SingleCache<>("static-single:36#DefaultNonEntityDao.doRetrieve");
+public static MultiCache<Parameters, Long> retrieveTenantRecordIdFromObjectInTransaction = new MultiCache<>("static-multi:35#DefaultNonEntityDao.retrieveTenantRecordIdFromObjectInTransaction");
 
     @Override
     public Long retrieveTenantRecordIdFromObjectInTransaction(@Nullable final UUID objectId, final ObjectType objectType, @Nullable final Object cache, @Nullable final Handle handle) {
@@ -132,7 +132,7 @@ return retrieveTenantRecordIdFromObjectInTransaction.computeIfAbsent(new Paramet
         return withCachingObjectId.withCaching(new OperationRetrieval<Long>() {
             @Override
             public Long doRetrieve(final ObjectType objectType) {
-return doRetrieve.computeIfAbsent(new Parameters(objectType), () -> {
+// return doRetrieve.computeIfAbsent(new Parameters(objectType), () -> {
                 final NonEntitySqlDao inTransactionNonEntitySqlDao = handle == null ? dbRouter.onDemand(true) : SqlObjectBuilder.attach(handle, NonEntitySqlDao.class);
 
                 switch (tableName) {
@@ -144,7 +144,7 @@ return doRetrieve.computeIfAbsent(new Parameters(objectType), () -> {
                         return inTransactionNonEntitySqlDao.getTenantRecordIdFromObjectOtherThanTenant(objectIdOrNull, tableName.getTableName());
                 }
 
-}, 20000);
+// }, 20000);
             }
         }, objectIdOrNull, objectType, tableName, cache);
 }, 20000);

diff --git a/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDao.java b/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDao.java
index 95f2048..38f323f 100644
--- a/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDao.java
+++ b/util/src/main/java/org/killbill/billing/util/tag/dao/DefaultTagDao.java
@@ -101,7 +101,7 @@ public class DefaultTagDao extends EntityDaoBase<TagModelDao, Tag, TagApiExcepti
         });
     }
 
-public static SingleCache<Parameters, List<TagModelDao>> getTagsForAccountType = new SingleCache<>("static-single:47#DefaultTagDao.getTagsForAccountType");
+public static SingleCache<Parameters, List<TagModelDao>> getTagsForAccountType = new SingleCache<>("static-single:16#DefaultTagDao.getTagsForAccountType");
 
     @Override
     public List<TagModelDao> getTagsForAccountType(final ObjectType objectType, final boolean includedDeleted, final InternalTenantContext internalTenantContext) {

diff --git a/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java b/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java
index 9c2ed2e..fbddb37 100644
--- a/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java
+++ b/util/src/main/java/org/killbill/billing/util/tag/DefaultTagInternalApi.java
@@ -73,7 +73,7 @@ public class DefaultTagInternalApi implements TagInternalApi {
         return toTagList(tagDao.getTagsForAccount(includedDeleted, context));
     }
 
-public static SingleCache<Parameters, List<Tag>> getTagsForAccountType = new SingleCache<>("static-single:50#DefaultTagInternalApi.getTagsForAccountType");
+public static SingleCache<Parameters, List<Tag>> getTagsForAccountType = new SingleCache<>("static-single:13#DefaultTagInternalApi.getTagsForAccountType");
 
     @Override
     public List<Tag> getTagsForAccountType(final ObjectType objectType, final boolean includedDeleted, final InternalTenantContext internalTenantContext) {