Fixed problem with cachedSources indexes