Added cache support.