Added buffer,h and cache.h (missed in previous commit)