Fixes Issue #3 and #4

Cache system and Category System