FEATURE: CL-4006 Remove selector caching