Added cache clear for both envs