removed some parts of cacheing