Moved some trigger cache logic