Change waiting list logic

Stops caching the waiting list and generates on the fly.