Add missing generic types to return values for getDataContainer() and getCacheEntry(K).