LPS-46046 Use thread local as in other repository classes