Add caches for various selectors
clean