Added some caching and some special logic for environments that are slightly misconfigured for volumes