Improve caching.
Allow other than default repository.