Bugfix: Cache not deleted correctly post submission