Trigger caching

Merged Trigger caching