Updated env var names, added cache info