Merge "Cache flag value to prevent performance regressions" into main