killbill-aplcache

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 2ba796a..8d30a76 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
@@ -1202,7 +1202,8 @@ public class AccountResource extends JaxRsResourceBase {
                                        @QueryParam(QUERY_AUDIT) @DefaultValue("NONE") final AuditMode auditMode,
                                        @javax.ws.rs.core.Context final HttpServletRequest request) {
         final UUID accountId = UUID.fromString(accountIdString);
-        final TenantContext tenantContext = context.createContext(request);
+
+        final TenantContext tenantContext = context.createTenantContextWithAccountId(accountId, request);
         final List<CustomField> customFields = objectType != null ?
                                                customFieldUserApi.getCustomFieldsForAccountType(accountId, objectType, tenantContext) :
                                                customFieldUserApi.getCustomFieldsForAccount(accountId, tenantContext);

diff --git a/util/pom.xml b/util/pom.xml
index 9f16602..56235b3 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -75,6 +75,10 @@
         </dependency>
         <dependency>
             <groupId>com.ning</groupId>
+            <artifactId>async-http-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.ning</groupId>
             <artifactId>compress-lzf</artifactId>
             <scope>test</scope>
         </dependency>