Removing cache functionality; refs #11