Minor code re-factor for generics and added comments
release to support request caching