Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev