improved and updated caching specs