caching and queueing working correctly now