Less logging
Fix source item caching