Changes for the TR version of the Storage-Aware Caching work