Fix queue mapping cache handling issues

[shilmyhasan]

• Add cache invalidation when queues are deleted from database
• Move the queue cache loader method and its supporting functions to a separate inner class.