Core.Resolution - fix concurrency issues