Fix tests (GC3XX5J is disabled)

Also, limit GC3XX5J modifications to the mocked cache instead of the
test itself.
Merge branch 'release' into upstream