ISPN-2300 Fix conditional operations to work with versioned caches