killbill-uncached

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
index 5b9fd42..c964e67 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AdminResource.java
@@ -218,8 +218,8 @@ public class AdminResource extends JaxRsResourceBase {
     }
 
     private void removeCacheByKey(final Ehcache tenantCache, final String tenantRecordId) {
-        for (String key : (List<String>) tenantCache.getKeys()) {
-            if (key.endsWith("::" + tenantRecordId)) {
+        for (Object key : tenantCache.getKeys()) {
+            if (null != key && key.toString().endsWith("::" + tenantRecordId)) {
                 tenantCache.remove(key);
             }
         }