added better error messaging
reverted cache change