caching/selector fix