Added rspec tests, lint cleanup, fixed cache for version 6