killbill-memoizeit

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java
index e43ce7d..4c6b84b 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/json/InvoiceItemJson.java
@@ -205,12 +205,12 @@ public class InvoiceItemJson extends JsonBase {
 
             @Override
             public String getProductName() {
-                return null;
+                return productName;
             }
 
             @Override
             public String getPrettyProductName() {
-                return null;
+                return prettyProductName;
             }
 
             @Override

diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java
index dc719f1..3bfa28c 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java
@@ -473,6 +473,8 @@ public class TestInvoice extends TestJaxrsBase {
         externalCharge.setAccountId(accountJson.getAccountId());
         externalCharge.setAmount(chargeAmount);
         externalCharge.setCurrency(accountJson.getCurrency());
+        externalCharge.setPlanName("SomePlan");
+        externalCharge.setProductName("SomeProduct");
         externalCharge.setDescription(UUID.randomUUID().toString());
         externalCharge.setItemDetails("Item Details");
         externalCharge.setLinkedInvoiceItemId(firstInvoiceItemId);
@@ -496,6 +498,8 @@ public class TestInvoice extends TestJaxrsBase {
         assertEquals(invoiceWithItems.getItems().get(0).getEndDate().compareTo(endDate), 0);
         assertEquals(invoiceWithItems.getItems().get(0).getItemDetails(), "Item Details");
         assertEquals(invoiceWithItems.getItems().get(0).getLinkedInvoiceItemId(), firstInvoiceItemId);
+        assertEquals(invoiceWithItems.getItems().get(0).getPlanName().compareTo("SomePlan"), 0);
+        assertEquals(invoiceWithItems.getItems().get(0).getProductName().compareTo("SomeProduct"), 0);
 
         // Verify the total number of invoices
         assertEquals(accountApi.getInvoicesForAccount(accountJson.getAccountId(), null, requestOptions).size(), 3);