Added basic cache support