Address TODO and Merge comments. 

Remove unused method from TableCache and children, remove the boolean
return from clear.