Tristan/fix cache exclusivity 1.2

Backport of !775 (merged)

Merge request reports

Loading