Merge "Cache XML blocks against file name rather than resource ID"