Added cache clearing