Replace some selectors with cached versions