diff --git a/src/modules/site/ee_mod_site_log.sh b/src/modules/site/ee_mod_site_log.sh
index 23264ffa..5fe46082 100644
--- a/src/modules/site/ee_mod_site_log.sh
+++ b/src/modules/site/ee_mod_site_log.sh
@@ -2,7 +2,7 @@
 
 function ee_mod_site_log()
 {
-		# Check if domain name present
+	# Check if domain name passed
         if [ $# -eq 0 ]; then
                 for ee_domain_name in $(ls /etc/nginx/sites-available/*); do
                         ee_log_path="$ee_log_path /var/log/nginx/$(basename $ee_domain_name).*.log"
diff --git a/src/modules/stack/ee_cache_clean.sh b/src/modules/stack/ee_cache_clean.sh
deleted file mode 100644
index 81aee59a..00000000
--- a/src/modules/stack/ee_cache_clean.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Clean all cache
-
-function ee_cache_clean()
-{
-	# Clean fastcgi cache 
-	if [ -d /var/run/nginx-cache/ ]; then
-		rm -rf /var/run/nginx-cache/* &>> $EE_COMMAND_LOG 
-	fi
-
-	# Clean memcache
-	dpkg --get-selections | grep -v deinstall | grep memcached &>> $EE_COMMAND_LOG
-
-	if [ $? -eq 0 ];then
-		service memcached restart &>> $EE_COMMAND_LOG 
-	fi
-}
diff --git a/src/modules/stack/ee_mod_cache_clean.sh b/src/modules/stack/ee_mod_cache_clean.sh
new file mode 100644
index 00000000..599f95e0
--- /dev/null
+++ b/src/modules/stack/ee_mod_cache_clean.sh
@@ -0,0 +1,35 @@
+# Clean all cache
+
+function ee_mod_cache_clean()
+{
+
+	for ee_param in $@ ; do
+
+		if [ "$ee_param" = "" ] || [ "$ee_param" = "fastcgi" ] || [ "$ee_param" = "all" ]; then
+			# Clean fastcgi cache 
+			ee_lib_echo "Cleaning FastCGI cache, please wait .... "
+			if [ -d /var/run/nginx-cache/ ]; then
+				rm -rf /var/run/nginx-cache/* &>> $EE_COMMAND_LOG 
+			fi
+		fi
+		
+		if [ "$ee_param" = "memcache" ] || [ "$ee_param" = "all" ]; then
+			# Clean memcache
+			ee_lib_echo "Cleaning Memcache, please wait .... "
+			dpkg --get-selections | grep -v deinstall | grep memcached &>> $EE_COMMAND_LOG \
+			|| ee_lib_error "Memcache not installed, exit status = " $?
+			if [ $? -eq 0 ];then
+				service memcached restart &>> $EE_COMMAND_LOG 
+			fi
+		fi
+
+		if [ "$ee_param" = "opcache" ] || [ "$ee_param" = "all" ]; then
+			# Clean opcache
+			ee_lib_echo "Cleaning OPcache, please wait .... "
+			wget --no-check-certificate --spider -q https://127.0.0.1:22222/cache/opcache/opgui.php?page=reset \
+			|| ee_lib_error "Unable to clean OPcache, exit status = " $?
+
+		fi
+	done
+
+}