Additional sources
Added caching prevention for testing purposes
Merge