Added cache load and save to calibrator