Additional work on cache