Merge pull request #2176 from solliancenet/cj-resource-cache-preload

Merge pull request #2176 from solliancenet/cj-resource-cache-preload #1137