Added cache management.
Refactored a bit
Cleaned the project
Merge remote-tracking branch 'origin/master'