WIP: Added caching with the android-query library - currently hacky