cache changes and improvements