Reverted to diskv for backing file store
Get conditional caching working again