Removed unnecessary value cache