I opened PR #1461 to the vmg/new-cache branch to make this change.