ogm updates, clear fix and addition of _IndexCache class