Merge "Change score cache eviction time to settings value." into oc-mr1-dev