Merged in apavlo/anticache branch.