Merge branch '21368'
issue #21497: Add cache for sites.
issue #21497: Fix blocking syntax problems with trigger.
Merge pull request #57 from jrogelstad/21497

issue #21497: Add cache for sites to time/expense.