Started adding automatic cache clearing