Removed jta dependency, fixed cache logic, and added 2 small tests