Added caching, removed extraneous database attributes