Refactor column value code
Columns cache implementation
Cleanup
Merge branch 'columns-cache'