Got the cache working