Issue #86: Removing unneeded caching (faster without the queries) and fix notices.
Issue #86: Correcting issues with new caching.