Added Empty Cache and Language support