Issue #22 - Added Container caching
v0.8.6