Removed lock on cache evaluation - fixed dead-lock while reindex (PY-12034).
Merge remote-tracking branch 'origin/133' into 133