Resurrect cache broken in master

Backport from eafafb32

Edited by Jabier Arraiza

Merge request reports

Loading