diff --git a/samples/expenses/src/main/java/com/google/gwt/sample/expenses/server/domain/Report.java b/samples/expenses/src/main/java/com/google/gwt/sample/expenses/server/domain/Report.java
index 2975080..96954de 100644
--- a/samples/expenses/src/main/java/com/google/gwt/sample/expenses/server/domain/Report.java
+++ b/samples/expenses/src/main/java/com/google/gwt/sample/expenses/server/domain/Report.java
@@ -17,11 +17,6 @@
 
 import com.google.appengine.api.datastore.Cursor;
 
-import net.sf.jsr107cache.Cache;
-import net.sf.jsr107cache.CacheException;
-import net.sf.jsr107cache.CacheFactory;
-import net.sf.jsr107cache.CacheManager;
-
 import org.datanucleus.store.appengine.query.JPACursorHelper;
 
 import java.util.Collections;
@@ -29,6 +24,10 @@
 import java.util.List;
 import java.util.logging.Logger;
 
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import javax.cache.CacheFactory;
+import javax.cache.CacheManager;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
diff --git a/samples/expenses/src/main/java/com/google/gwt/sample/expenses/server/domain/ReportBack.java b/samples/expenses/src/main/java/com/google/gwt/sample/expenses/server/domain/ReportBack.java
index 88f90c7..791c63d 100644
--- a/samples/expenses/src/main/java/com/google/gwt/sample/expenses/server/domain/ReportBack.java
+++ b/samples/expenses/src/main/java/com/google/gwt/sample/expenses/server/domain/ReportBack.java
@@ -17,11 +17,6 @@
 
 import com.google.appengine.api.datastore.Cursor;
 
-import net.sf.jsr107cache.Cache;
-import net.sf.jsr107cache.CacheException;
-import net.sf.jsr107cache.CacheFactory;
-import net.sf.jsr107cache.CacheManager;
-
 import org.datanucleus.store.appengine.query.JPACursorHelper;
 
 import java.util.Collections;
@@ -29,6 +24,10 @@
 import java.util.List;
 import java.util.logging.Logger;
 
+import javax.cache.Cache;
+import javax.cache.CacheException;
+import javax.cache.CacheFactory;
+import javax.cache.CacheManager;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;