added in parsing options and fixed some cache responsibilities