Removed isZeroSite()'s caching

Change-Id: I1d1611d1f959bfd33cce8e5d42affd5a634faf77
Merge "Removed isZeroSite()'s caching"