Catching up to the new ISCache which addresses some notable performance issues.