more caching improvements; completely ignoring files ending with "~"