Towards 2.3

Refactoring to cache more info about the Queue.Items 
Using the cache for Matrix lookups