Merge "BUG-2459: use thread-local cache of transformers"