Better selectors, better retries, fix cache invalidation