MODE-2265 Removed WS cache locking