Merge "Add path cache to avoid SharedPreferences jank." into nyc-dev