More work on adding use of the cache api