Merge "Only use cacheLock when it's needed" into oc-dev