Added support for reepository caching