Add support for cache [part 2]