merge
Added caching and sync with e3s