Merge branch 'cache-selected'