Adding a cache support