Emms-cache bugfix
Further emms-cache tuning