Added the optional_dbm_support branch and made a minor renaming change on this branch for the coming non-dbm file cache support.