Feature/dalli support