Merge branch 'MDL-68329-cache-info' of https://github.com/brendanheywood/moodle