added caching back in for measures