Change query timeout
Add notification cache