Merge change 4669 into donut

* changes:
  Fixes #1922373. Resolves a case of keys collision in Resources' cache.