Fixed issue with metadata caching.