Beginning to add cache support.