Merge "Split LocalisationCache.php classes into own files"