Add leo-cache instead of ecache
Rollback cache functions
Replace cache-function from ecache to leo_cache