Added schedule caching