Progress.

Cache tables refactoring.