Adding a cache feature