Finish rename + support a normalized ua at the begining of cache keys