Add initial support for cache