Wayf changes for new metadata, plus more caching options.