[IMPROVED] non-auto expire caches added