changed paths of caches
changed layout to be a bit faster