Merge tag '0.95a6' into development

Add ability to cache contexts for OCL
Cache contexts and queues
Bumping version for release
Merge branch 'release/0.95a7'