More cleaning up before starting to add methods to LocalCache