Merge "ResourcesManager: Fix a cache issue" into nyc-dev