Fixing usages of OperationCaching