killbill-uncached

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/caching/EhCacheCatalogCache.java b/catalog/src/main/java/org/killbill/billing/catalog/caching/EhCacheCatalogCache.java
index 970e3f7..c3351c9 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/caching/EhCacheCatalogCache.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/caching/EhCacheCatalogCache.java
@@ -79,7 +79,9 @@ public class EhCacheCatalogCache implements CatalogCache {
 
     @Override
     public void clearCatalog(final InternalTenantContext tenantContext) {
-        cacheController.remove(tenantContext.getTenantRecordId());
+        if (tenantContext.getTenantRecordId() != InternalCallContextFactory.INTERNAL_TENANT_RECORD_ID) {
+            cacheController.remove(tenantContext.getTenantRecordId());
+        }
     }
 
     //
@@ -95,7 +97,7 @@ public class EhCacheCatalogCache implements CatalogCache {
             }
         };
         final Object[] args = new Object[1];
-        args[0]= loaderCallback;
+        args[0] = loaderCallback;
         final ObjectType irrelevant = null;
         final InternalTenantContext notUsed = null;
         return new CacheLoaderArgument(irrelevant, args, notUsed);