Added cache and several server side revisions