Merge branch 'ma/header-dup-cleanup'

Code clean-up. * ma/header-dup-cleanup: cache.h: drop duplicate `ensure_full_index()` declaration