Updated to cache on startup, and another quote to escape