Fixes, addition of caches