Merge "Make sure to clear out preference cache when done" into nyc-mr1-dev