Merge "Add a flag for the new System API which improve caching implementation." into main