Merge "[CDM][Refactoring 3/N] Consolidate association cache and disk" into main