diff --git a/specimen/src/org/labkey/specimen/SpecimenRequestManager.java b/specimen/src/org/labkey/specimen/SpecimenRequestManager.java
index 69d7b324..27764a3b 100644
--- a/specimen/src/org/labkey/specimen/SpecimenRequestManager.java
+++ b/specimen/src/org/labkey/specimen/SpecimenRequestManager.java
@@ -29,7 +29,6 @@
 import org.labkey.api.collections.LongArrayList;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.Container;
-import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.DatabaseCache;
 import org.labkey.api.data.DbScope;
 import org.labkey.api.data.RuntimeSQLException;
@@ -906,7 +905,7 @@ public void setViewColumnName(String viewColumnName)
         }
     }
 
-    private final BlockingCache<GUID, Map<String, Map<String, Object>>> GROUPED_VALUES_CACHE = DatabaseCache.get(SpecimenSchema.get().getScope(), 10, 8 * CacheManager.HOUR, "Specimen grouped values", new GroupedValuesCacheLoader());
+    private final BlockingCache<Container, Map<String, Map<String, Object>>> GROUPED_VALUES_CACHE = DatabaseCache.get(Container.class, SpecimenSchema.get().getScope(), 10, 8 * CacheManager.HOUR, "Specimen grouped values", new GroupedValuesCacheLoader());
 
     private static class GroupedResults
     {
@@ -919,25 +918,24 @@ private static class GroupedResults
 
     public void clearGroupedValuesForColumn(Container container)
     {
-        GROUPED_VALUES_CACHE.remove(container.getEntityId());
+        GROUPED_VALUES_CACHE.remove(container);
     }
 
     @NotNull
     public Map<String, Map<String, Object>> getGroupedValuesForColumn(Container container, User user, ArrayList<String[]> groupings)
     {
-        return GROUPED_VALUES_CACHE.get(container.getEntityId(), Pair.of(user, groupings));
+        return GROUPED_VALUES_CACHE.get(container, Pair.of(user, groupings));
     }
 
-    private class GroupedValuesCacheLoader implements CacheLoader<GUID, Map<String, Map<String, Object>>>
+    private class GroupedValuesCacheLoader implements CacheLoader<Container, Map<String, Map<String, Object>>>
     {
         @Override
-        public Map<String, Map<String, Object>> load(@NotNull GUID containerId, @Nullable Object argument)
+        public Map<String, Map<String, Object>> load(@NotNull Container c, @Nullable Object argument)
         {
             Map<String, Map<String, Object>> groupedValues = new HashMap<>();
 
             // ColumnName and filter names are "QueryView" names; map them to actual table names before building query
-            Container c = ContainerManager.getForId(containerId);
-            Study study = null != c ? StudyService.get().getStudy(c) : null;
+            Study study = StudyService.get().getStudy(c);
             if (study != null)
             {
                 @SuppressWarnings("unchecked") Pair<User, List<String[]>> pair = (Pair<User, List<String[]>>)argument;