Issue #6 - now caching more information where appropriate.  Additionally cleaned up how we instantiate all ConcurrentMaps