removed originalValue check. No need with cache