Merge branch 'registerschema-caching' into master-qg