Updated the caching metadata so that it's attributes can be optional