Merge branch 'stable-3.5'

* stable-3.5:
  Adapt to new ProjectCache interface

Depends-on: https://gerrit-review.googlesource.com/c/gerrit/+/324075
Change-Id: Idda364e6f3f9138be3700657b11f510ac52f25f9