Adding caches / but not fully hooked up