fix issue with bad cache
Merge branch 'validator' into staging2