Remove temp hacks
Update version of Cappuccino
Use table view dataview caching