Merge "Make ServiceInfo cache more permanent."