More work on cache system.