Adding cache support