Updated clear cache and globals