Caching fix, try #2

Keep local and external stuff separate (no caching of external stuff)