Merge "Backing up cached resource IDs with resource names"