Filled out the cache class (closes #13)