Introduce cachedOp selection and storage. Clear on modify.