Fix memoize to include more data to make deviceClasses unique...