Merge "RegisteredServicesCache now saves files to a user-specific dir"