fixed #150
More refactoring and linting
Using || instead of or
Added dependencies for encryption and started on interface
Added crypto key generation
Fixed cache helper