Improve performances by moving the caching outside of the saturation