Merge "Make LocalisationCache a service" into REL1_34