Merge "Refactor list-caches into Custom Views with Listeners"