Add a few more caches to hot spots

Change-Id: Iee01f3e40b4b20b59be888ea9c42596f37246908