Avoid expensive locking on every Language access
Merge pull request #2722 from federicobond/language-locking

Avoid expensive locking on every Language access