Modified some files to use dalli