Cache support added