More refactoring.

Moved row, col to cell constructors, added cellCache.