Merge "Switch the sidebar cache to using checkKeys"