Adding cache support.