removed functions not needed with cache