cacheing improvements