Use protected and fix location cache name