Concurrent access fix

Similar problem as with NEXUS-6243, if concurrently invoked
this method my cause EhCache to puke.