Started cache support

Still not working properly