Added configuration needed for view caching
Added touch true to the reviews
merge with master