Merge branch 'ne/rev-cache' into pu