1.2 branch

Implement views + cache